openerp-dev-web team mailing list archive
-
openerp-dev-web team
-
Mailing list archive
-
Message #05441
lp:~openerp-dev/openobject-addons/addons-training-all-report-fix-ysa into lp:~openobject-training/openobject-addons/training
Yogesh(Open ERP) has proposed merging lp:~openerp-dev/openobject-addons/addons-training-all-report-fix-ysa into lp:~openobject-training/openobject-addons/training.
Requested reviews:
OpenObject Training (openobject-training)
For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-all-report-fix-ysa/+merge/57646
FIX] training_* :- fix some problem in report. remove style attribute in tr tag.
--
https://code.launchpad.net/~openerp-dev/openobject-addons/addons-training-all-report-fix-ysa/+merge/57646
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-addons/addons-training-all-report-fix-ysa.
=== modified file 'training_diagnostic/object/training.py'
--- training_diagnostic/object/training.py 2011-03-31 09:17:04 +0000
+++ training_diagnostic/object/training.py 2011-04-14 10:11:02 +0000
@@ -385,7 +385,7 @@
tpdl = self.pool.get('training.participation.domain.line')
tpcl = self.pool.get('training.participation.course.line')
- tpdl_current_ids = tpdl.search(cr, uid, [('participation_id', '=', ssparticipation_id)], context=context)
+ tpdl_current_ids = tpdl.search(cr, uid, [('participation_id', '=', participation_id)], context=context)
if len(tpdl_current_ids):
raise osv.except_osv(_('Error'),
_('Can\'t generate exam sheet on participation which already have domain line'))
=== modified file 'training_diagnostic/report/diagnostic.rml'
--- training_diagnostic/report/diagnostic.rml 2011-04-05 10:57:36 +0000
+++ training_diagnostic/report/diagnostic.rml 2011-04-14 10:11:02 +0000
@@ -153,7 +153,7 @@
<td><para style="white-9-center-bold">Confirmed by assessor</para></td>
</tr>
<tr>[[ repeatIn(get_domain_lines_info(p), 'dl') ]]
- [[ not dl['domain'] and setTag('tr', 'tr', {'style': 'Table_Domains_SecondLine'}) or setTag('tr', 'tr', {'style': 'Table_Domains_Line'}) ]]
+ [[ not dl['domain'] and setTag('tr', 'tr', {}) or setTag('tr', 'tr', {}) ]]
<td><para style="std-10-left"> [[ dl['domain'] ]]</para></td>
<td><para style="std-10-center">[[ dl['score'] ]]</para></td>
<td><para style="std-10-center">[[ dl['ideal_score'] ]]</para></td>
=== modified file 'training_diagnostic/report/diagnostic_results.rml'
--- training_diagnostic/report/diagnostic_results.rml 2011-04-05 10:57:36 +0000
+++ training_diagnostic/report/diagnostic_results.rml 2011-04-14 10:11:02 +0000
@@ -153,7 +153,7 @@
<td><para style="white-9-center-bold">Confirmed by assessor</para></td>
</tr>
<tr>[[ repeatIn(get_domain_lines_info(p), 'dl') ]]
- [[ not dl['domain'] and setTag('tr', 'tr', {'style': 'Table_Domains_SecondLine'}) or setTag('tr', 'tr', {'style': 'Table_Domains_Line'}) ]]
+ [[ not dl['domain'] and setTag('tr', 'tr', {}) or setTag('tr', 'tr', {}) ]]
<td><para style="std-10-left"> [[ dl['domain'] ]]</para></td>
<td><para style="std-10-center">[[ dl['score'] ]]</para></td>
<td><para style="std-10-center">[[ dl['score_perc'] and '%s%%' % (formatLang(dl['score_perc'])) or '' ]]</para></td>
=== modified file 'training_diagnostic/report/diagnostic_synthesis.rml'
--- training_diagnostic/report/diagnostic_synthesis.rml 2011-04-11 10:03:35 +0000
+++ training_diagnostic/report/diagnostic_synthesis.rml 2011-04-14 10:11:02 +0000
@@ -233,7 +233,7 @@
<td><para style="white-9-center-bold">Confirmed by assessor</para></td>
</tr>
<tr>[[ repeatIn(get_domain_lines_info(p), 'dl') ]]
- [[ not dl['domain'] and setTag('tr', 'tr', {'style': 'Table_Domains_SecondLine'}) or setTag('tr', 'tr', {'style': 'Table_Domains_Line'}) ]]
+ [[ not dl['domain'] and setTag('tr', 'tr', {}) or setTag('tr', 'tr', {}) ]]
<td><para style="std-10-left"> [[ dl['domain'] ]]</para></td>
<td><para style="std-10-center">[[ dl['score'] ]]</para></td>
<td><para style="std-10-center">[[ dl['ideal_score'] ]]</para></td>
@@ -267,7 +267,7 @@
<td><para style="white-9-center-bold">Confirmed by assessor</para></td>
</tr>
<tr>[[ repeatIn(get_domain_lines_info(p), 'dl') ]]
- [[ not dl['domain'] and setTag('tr', 'tr', {'style': 'Table_Domains_SecondLine'}) or setTag('tr', 'tr', {'style': 'Table_Domains_Line'}) ]]
+ [[ not dl['domain'] and setTag('tr', 'tr', {}) or setTag('tr', 'tr', {}) ]]
<td><para style="std-10-left"> [[ dl['domain'] ]]</para></td>
<td><para style="std-10-center">[[ dl['score'] ]]</para></td>
<td><para style="std-10-center">[[ dl['ideal_score'] ]]</para></td>
=== modified file 'training_diagnostic/report/domain_barchart.py'
--- training_diagnostic/report/domain_barchart.py 2011-03-31 09:17:04 +0000
+++ training_diagnostic/report/domain_barchart.py 2011-04-14 10:11:02 +0000
@@ -26,26 +26,27 @@
g_domains = {}
g_domains_max = {}
g_levels = set()
-
for line in p.participation_line_ids:
qn = line.question_id
qn_level = qn.level_id
- g_levels.add(qn_level.id)
+ if qn_level:
+ g_levels.add(qn_level.id)
qn_domains = set()
for comp in qn.competency_ids:
for dom in comp.domain_ids:
qn_domains.add(dom.id)
+
for d in qn_domains:
g_domains_max.setdefault(d, {}).setdefault(qn_level.id, []).append(qn.point)
if -0.00001 <= line.point <= 0.00001:
# point is null, no score to add to domain
continue
+
for d in qn_domains:
g_domains.setdefault(d, {}).setdefault(qn_level.id, []).append(qn.point)
-
- level_pool = p.pool.get('training.exam.question.level')
+ level_pool = self.pool.get('training.exam.question.level')
level_ids = []
for i, l in enumerate(level_pool.browse(self.cr, self.uid, list(g_levels))):
@@ -68,7 +69,6 @@
l_score_ratio = l_sum * 100 / dl_score
l_max_ratio = l_sum * 100 / dl_max
l_dom_max_ratio = l_sum * 100.0 / (sum(dom_max_qn.get(lid, [])) or 1.0)
-
res['datas'][i].append(l_max_ratio)
if l_sum > 0.0:
res['datas_label'][i].append('%.2f%%\n(%.2f%%)' % (l_score_ratio, l_dom_max_ratio))
