1 |
<<<<<<< .mine |
2010-11-24 Bernhard Herzog <[email protected]> |
2 |
|
|
3 |
|
* formed/formed/plugins/export/rules_sh.py: expand star-import. |
4 |
|
|
5 |
|
2010-11-24 Bernhard Herzog <[email protected]> |
6 |
|
|
7 |
|
* formed/formed/plugins/export/rules_sh.py (sql_OperatorUnary): |
8 |
|
Put parentheses around the comparison for the KNOWN operator in |
9 |
|
the generated SQL to ensure correct evaluation order. |
10 |
|
|
11 |
|
2010-11-24 Bernhard Herzog <[email protected]> |
12 |
|
|
13 |
|
* formed/formed/plugins/export/rules_sh.py (binary_operator_map): |
14 |
|
New. Map binary formed expr operators to their SQL counterparts. |
15 |
|
(sql_OperatorBinary): Use binary_operator_map instead of a cascade |
16 |
|
of if-statements with lots of code duplication. Also, put |
17 |
|
parentheses around the resulting SQL expression to make sure the |
18 |
|
expression is correctly. This fixes a problem with WASKO tagging |
19 |
|
rules, where the a FormEd expression of the form like "2 1 1980 |
20 |
|
date 1 1 1980 date - 93 *" would be incorrectly converted to the |
21 |
|
SQL expression "93 * '1980-01-02'::date - '1980-01-01'::date" |
22 |
|
|
23 |
|
2010-11-24 Bernhard Herzog <[email protected]> |
24 |
|
|
25 |
|
* formed/formed/plugins/export/rules_sh.py: Fix formatting. |
26 |
|
|
27 |
|
2010-11-15 Torsten Irlaender <[email protected]> |
28 |
|
|
29 |
|
* formed/formed/model/data.py: Do not set attribute "repeat" for |
30 |
|
Repeat-Groups. |
31 |
|
|
32 |
|
2010-11-10 Torsten Irlaender <[email protected]> |
33 |
|
|
34 |
|
* formed/formed/plugins/modify/rules.py: Fixed date sequence rule |
35 |
|
checks for date in future. |
36 |
|
|
37 |
|
2010-11-08 Roland Geider <[email protected]> |
38 |
|
|
39 |
|
* formed/formed/plugins/export/xsd.py: validate formedtree.xml |
40 |
|
|
41 |
|
2010-11-08 Roland Geider <[email protected]> |
42 |
|
|
43 |
|
* formed/formed/model/data.py, |
44 |
|
formed/formed/plugins/export/xsd.py, |
45 |
|
formed/formed/config.py: issue1131: generate XSD for case exports |
46 |
|
|
47 |
|
2010-10-21 Torsten Irlaender <[email protected]> |
48 |
|
|
49 |
|
* formed/formed/plugins/export/rules_sh.py: Added new LE-Operator |
50 |
|
* formed/formed/plugins/modify/rules.py: Add error rule to force phase |
51 |
|
relevant datefields not to be "unknown". |
52 |
|
|
53 |
|
2010-10-12 Roland Geider <[email protected]> |
54 |
|
|
55 |
|
* formed/formed/plugins/export/rules_sh.py: Ignore rules if any fields |
56 |
|
in the rule are in a repeat group |
57 |
|
|
58 |
|
2010-10-11 Roland Geider <[email protected]> |
59 |
|
|
60 |
|
* formed/plugins/export/rules_sh.py: Added support to more opperators |
61 |
|
to be able to export the WASKO case |
62 |
|
|
63 |
|
2010-10-06 Torsten Irlaender <[email protected]> |
64 |
|
|
65 |
|
* formed/formed/plugins/export/rules_sh.py (generate_tagging): Fixed |
66 |
|
gerating SQL for Rules |
67 |
|
* formed/formed/plugins/export/rules_sh.py (sql_date): Fixed sql_date |
68 |
|
function. |
69 |
|
|
70 |
|
2010-10-05 Torsten Irländer <[email protected]> |
71 |
|
|
72 |
|
* formed/formed/model/data.py: Fixed error when setting tag attribute. |
73 |
|
* formed/formed/plugins/export/rules_sh.py: Added generating exporting |
74 |
|
tagging-xml |
75 |
|
* formed/formed/plugins/modify/rules.py: Do not generate automatic |
76 |
|
tagids for rules. |
77 |
|
|
78 |
|
2010-10-04 Torsten Irländer <[email protected]> |
79 |
|
|
80 |
|
* formed/formed/model/data.py (RuleLeaf.__init__): Added new attribute |
81 |
|
"tag" for rule-leafs |
82 |
|
* formed/formed/config.py: Added export rules as XML to Menu |
83 |
|
* formed/formed/plugins/modify/rules.py |
84 |
|
(GenerateRequiredRules.generateDateSequenceRules): Generate automatic |
85 |
|
tag ids for date-sequence rules |
86 |
|
|
87 |
|
2010-09-30 Torsten Irländer <[email protected]> |
88 |
|
|
89 |
|
* formed/formed/plugins/export/rules_sh.py |
90 |
|
(ExportRulesAsSH.doExport): Filter out duplicted rules. |
91 |
|
|
92 |
|
2010-09-20 Frank Koormann <[email protected]> |
93 |
|
|
94 |
|
* formed/formed/plugins/export/latex.py (RecursiveExporter): |
95 |
|
Add "required"-field information to output and include |
96 |
|
choice list contents. |
97 |
|
|
98 |
|
2010-09-16 Bernhard Herzog <[email protected]> |
99 |
|
|
100 |
|
Avoid database deadlocks that can happen when database clients try |
101 |
|
to work with the same case using two separate database |
102 |
|
connections. See mpuls/issue1145 for details. |
103 |
|
|
104 |
|
* formed/formed/plugins/export/rg_sql.py (SQL_TEMPLATE): Split the |
105 |
|
computation of the new json structure description into the new |
106 |
|
database function compute_case_structure |
107 |
|
(TRIGGER_TMPL): Change the trigger functions to immediately update |
108 |
|
the cached json structure description instead of just setting the |
109 |
|
modified flag. This avoids the lazy recomputation that makes what |
110 |
|
seems like a read-only access (calling get_case_structure) into a |
111 |
|
writing access (updates of the cache). The writes lock the row in |
112 |
|
the case_structure table which prevent other connections from |
113 |
|
accessing the same case. As part of this, the delete triggers are |
114 |
|
now AFTER triggers because the repeat groups instance must have |
115 |
|
been removed when the structure is recomputed. |
116 |
|
(SUBSELECT_TMPL): Since the delete trigger is now an after |
117 |
|
trigger, we need to change the way the master id is computed. We |
118 |
|
cannot join with the repeatgroup table in question because the row |
119 |
|
has already been deleted. However, we can use the master_id |
120 |
|
column of the OLD row to select the row of the parent table. |
121 |
|
(create_triggers): Avoid the inner joins with the current repeat |
122 |
|
group for the above mentioned reasons. In the very common case of |
123 |
|
repeat groups which are direct children of the master_tbl, we can |
124 |
|
compare the master_tbl.id directly with the row's master_id. |
125 |
|
|
126 |
|
2010-09-14 Roland Geider <[email protected]> |
127 |
|
|
128 |
|
* formed/formed/plugins/export/xsd.py: issue1131: update XSD for new |
129 |
|
formedtree structure |
130 |
|
|
131 |
|
2010-09-01 Roland Geider <[email protected]> |
132 |
|
|
133 |
|
* formed/formed/plugins/modify/rules.py: issue1050: mandatory fields |
134 |
|
appearing double. |
135 |
|
The problem was that the way the formEditor handled fields with |
136 |
|
manually created rules changed. Instead of ignoring fields (very |
137 |
|
early behaviour) or always generating them (early behaviour), now the |
138 |
|
formED will only ignore fields with rules which name starts with |
139 |
|
'required-rule-manual'. This is helpful when the rules for mandatory |
140 |
|
fields are more complex (e.g. mother's name is only required if |
141 |
|
mother is known). |
142 |
|
|
143 |
|
2010-08-10 Torsten Irländer <[email protected]> |
144 |
|
|
145 |
|
* contrib/diff_formed.py: New helperscript to diff to given |
146 |
|
formedtrees |
147 |
|
|
148 |
|
2010-08-09 Roland Geider <[email protected]> |
149 |
|
|
150 |
|
* formed/model/exprtree.py: fixed typo |
151 |
|
|
152 |
|
2010-08-04 Bernhard Herzog <[email protected]> |
153 |
|
|
154 |
|
* formed/po/de_DE.po: Update translations |
155 |
|
|
156 |
|
2010-08-04 Bernhard Herzog <[email protected]> |
157 |
|
|
158 |
|
* formed/po/formed.pot: Regenerated. |
159 |
|
|
160 |
|
* formed/po/de_DE.po: Update. |
161 |
|
|
162 |
|
2010-08-04 Bernhard Herzog <[email protected]> |
163 |
|
|
164 |
|
* formed/po/Makefile: Use correct filename of the pot-file in the |
165 |
|
usage message |
166 |
|
|
167 |
|
2010-08-04 Bernhard Herzog <[email protected]> |
168 |
|
|
169 |
|
* formed/po/Makefile (LIST_POTFILES): Sort the file names to make |
170 |
|
the order of entries in the .pot-file more predictable. |
171 |
|
|
172 |
|
2010-08-04 Bernhard Herzog <[email protected]> |
173 |
|
|
174 |
|
* formed/formed/model/nodecomponents.py (RootNode.__init__) |
175 |
|
(RootNode.getVersion, RootNode.setVersion): Add attribute |
176 |
|
"version" and accessor methods. |
177 |
|
|
178 |
|
* formed/formed/main.py (MainFrame.OnSetDocumentVersion): New. Let |
179 |
|
the user set the document version. |
180 |
|
(MainFrame._createMenuBar): Add menu item for OnSetDocumentVersion |
181 |
|
|
182 |
|
2010-08-02 Bernhard Herzog <[email protected]> |
183 |
|
|
184 |
|
* formed/formed.py, formed/formed/io/document.py, |
185 |
|
formed/formed/io/factories.py, formed/formed/io/parser.py, |
186 |
|
formed/formed/model/data.py, formed/formed/model/event.py, |
187 |
|
formed/formed/model/expr.py, formed/formed/model/exprtree.py, |
188 |
|
formed/formed/model/memory.py, formed/formed/model/misc.py, |
189 |
|
formed/formed/model/nodecomponents.py, |
190 |
|
formed/formed/model/persistent.py: Fix coding declaration to be |
191 |
|
acceptable to both python and Emacs. |
192 |
|
|
193 |
|
2010-07-29 Torsten Irländer <[email protected]> |
194 |
|
|
195 |
|
* formed/formed/model/data.py: Added "invisible" attribute to |
196 |
|
BoolLeafs. This can be used to hide options in choicelists. so the |
197 |
|
user can not select the value in the user interface. But the db will |
198 |
|
have this option so is ist still present in the db an can be used |
199 |
|
* formed/formed/model/exprtree.py: Added "days" function. |
200 |
|
|
201 |
|
2010-07-26 Roland Geider <[email protected]> |
202 |
|
|
203 |
|
* formed/formed/model/nodecomponents.py, |
204 |
|
formed/formed/plugins/modify/rules.py: generated date rules take |
205 |
|
into consideration repeat groups |
206 |
|
|
207 |
|
2010-07-21 Torsten Irländer <[email protected]> |
208 |
|
|
209 |
|
Issue870 |
210 |
|
|
211 |
|
* formed/formed/plugins/modify/rules.py (descriptions): Do not collect |
212 |
|
all headers to the referenced fields. Only list labels of the error |
213 |
|
fields, which should be distinct enough. |
214 |
|
|
215 |
|
Issue851 |
216 |
|
|
217 |
|
* formed/formed/model/data.py |
218 |
|
formed/formed/plugins/export/new_sql.py |
219 |
|
formed/formed/plugins/web/view_renderer.py |
220 |
|
formed/formed/io/document.py |
221 |
|
formed/formed/config.py: Added Float-Field to Formed |
222 |
|
|
223 |
|
2010-06-11 Bernhard Herzog <[email protected]> |
224 |
|
|
225 |
|
* formed/formed/plugins/export/rg_sql.py |
226 |
|
(CREATE_DELETE_MASTER_TMPL): In create_master_tbl, call |
227 |
|
create_master_ds to create the master tbl entry. This way we can |
228 |
|
add SQL code that's specific to an MPuls instance to |
229 |
|
create_master_ds and still have create_master_tbl use that new |
230 |
|
code. This is useful for e.g. the JMD-Struktur part. |
231 |
|
|
232 |
|
2010-06-02 Roland Geider <[email protected]> |
233 |
|
|
234 |
|
* formed/formed/plugins/modify/rules.py: make the names of generated |
235 |
|
date-sequence-rules unique |
236 |
|
|
237 |
|
2010-06-02 Roland Geider <[email protected]> |
238 |
|
|
239 |
|
* formed/plugins/export/xls.py: updated regular expression |
240 |
|
|
241 |
|
2010-05-17 Frank Koormann <[email protected]> |
242 |
|
|
243 |
|
* formed/formed/plugins/export/latex.py: Improved section labeling. |
244 |
|
|
245 |
|
* formed/formed/plugins/export/xls.py: |
246 |
|
Export references (ie where are the lists used). |
247 |
|
|
248 |
2010-04-30 Torsten Irländer <[email protected]> |
2010-04-30 Torsten Irländer <[email protected]> |
249 |
|
|
250 |
* formed/formed/plugins/modify/rules.py (VariableType.substitute): Do |
* formed/formed/plugins/modify/rules.py (VariableType.substitute): Do |
253 |
2010-04-28 Roland Geider <[email protected]> |
2010-04-28 Roland Geider <[email protected]> |
254 |
|
|
255 |
* formed/plugins/export/xls.py: Radiogroups are exported |
* formed/plugins/export/xls.py: Radiogroups are exported |
256 |
* formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD |
* formed/plugins/export/xsd.py: WASKA formedtree.xml validates XSD |
257 |
JMD formedtree.xml validates XSD |
JMD formedtree.xml validates XSD |
258 |
|
|
259 |
2010-04-08 Torsten Irländer <[email protected]> |
2010-04-08 Torsten Irländer <[email protected]> |
260 |
|
|
261 |
* formed/formed/plugins/modify/rules.py |
* formed/formed/plugins/modify/rules.py |