Skip to content

Commit

Permalink
Merge pull request openeducat#564 from avan4668/15.0-avan-migration
Browse files Browse the repository at this point in the history 
15.0 openeducat_erp migration
  • Loading branch information
@parthivgls
parthivgls committed Sep 15, 2021
2 parents e37be02 + 64a92f3 commit d9c6705
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 43 deletions.
2 changes: 1 addition & 1 deletion openeducat_exam/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

{
'name': 'OpenEduCat Exam',
'version': '14.0.1.0',
'version': '15.0.1.0',
'license': 'LGPL-3',
'category': 'Education',
"sequence": 3,
Expand Down
14 changes: 7 additions & 7 deletions openeducat_exam/report/report_ticket.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
<b>Hall Ticket</b>
</h3>
(
<span t-raw="'%s' % o['exam'] if o['exam'] else ''"/>
<span t-raw="'%s' % o['exam_code'] if o['exam_code'] else ''"/>
<span t-out="o['exam'] if o['exam'] else ''"/>
<span t-out="o['exam_code'] if o['exam_code'] else ''"/>
)
</div>
<br></br>
Expand All @@ -51,13 +51,13 @@
<tr>
<td>
<b>Roll No :</b>
<span t-raw="'%s' % o['roll_number'] if o['roll_number'] else ''"/>
<span t-out="o['roll_number'] if o['roll_number'] else ''"/>
</td>
</tr>
<tr>
<td>
<b>Course :</b>
<span t-raw="'%s' % o['course'] if o['course'] else ''"/>
<span t-out="o['course'] if o['course'] else ''"/>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -99,16 +99,16 @@
<tbody class="text-center" style="font-size:12px;">
<tr t-foreach="o['line']" t-as='s'>
<td>
<span t-raw="'%s' % s['subject'] if s['subject'] else ''"/>
<span t-out="s['subject'] if s['subject'] else ''"/>
</td>
<td>
<span t-raw="'%s' % s['date'] if s['date'] else ''" t-options="{'widget':'date'}"/>
<span t-out="s['date'] if s['date'] else ''" t-options="{'widget':'date'}"/>
</td>
<td>
<span t-esc="s['time']"/>
</td>
<td>
<span t-raw="'%s' % s['sup_sign'] if s['sup_sign'] else ''"/>
<span t-out="s['sup_sign'] if s['sup_sign'] else ''"/>
</td>
</tr>
</tbody>
Expand Down
52 changes: 26 additions & 26 deletions openeducat_exam/report/student_marksheet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,21 @@
<tr>
<td>
<b>Student Name:</b>
<span t-raw="'%s' % obj.student_id.name if obj.student_id.name else ''"/>
<span t-out="obj.student_id.name if obj.student_id.name else ''"/>
</td>
<td class="text-right">
<b>Course:</b>
<span t-raw="'%s' % obj.marksheet_reg_id.exam_session_id.course_id.name if obj.marksheet_reg_id.exam_session_id.course_id.name else ''"/>
<span t-out="obj.marksheet_reg_id.exam_session_id.course_id.name if obj.marksheet_reg_id.exam_session_id.course_id.name else ''"/>
</td>
</tr>
<tr>
<td>
<b>Exam Name:</b>
<span t-raw="'%s' % obj.marksheet_reg_id.name if obj.marksheet_reg_id.name else ''"/>
<span t-out="obj.marksheet_reg_id.name if obj.marksheet_reg_id.name else ''"/>
</td>
<td class="text-right">
<b>Exam Code:</b>
<span t-raw="'%s' % obj.marksheet_reg_id.exam_session_id.exam_code if obj.marksheet_reg_id.exam_session_id.exam_code else ''"/>
<span t-out="obj.marksheet_reg_id.exam_session_id.exam_code if obj.marksheet_reg_id.exam_session_id.exam_code else ''"/>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -88,27 +88,27 @@
<td
class="text-center">
<span
t-raw="'%s' % result.exam_id.subject_id.name if result.exam_id.subject_id.name else ''"/>
t-out="result.exam_id.subject_id.name if result.exam_id.subject_id.name else ''"/>
</td>
<td
class="text-center">
<span
t-raw="'%s' % result.exam_id.session_id.exam_type.name if result.exam_id.session_id.exam_type.name else ''"/>
t-out="result.exam_id.session_id.exam_type.name if result.exam_id.session_id.exam_type.name else ''"/>
</td>
<td
class="text-right">
<span
t-raw="'%s' % result.exam_id.total_marks if result.exam_id.total_marks else ''"/>
t-out="result.exam_id.total_marks if result.exam_id.total_marks else ''"/>
</td>
<td
class="text-right">
<span
t-raw="'%s' % result.exam_id.min_marks if result.exam_id.min_marks else ''"/>
t-out="result.exam_id.min_marks if result.exam_id.min_marks else ''"/>
</td>
<td
class="text-right">
<span
t-raw="'%s' % result.marks if result.marks else '--'"/>
t-out="result.marks if result.marks else '--'"/>
</td>
</tr>
</t>
Expand Down Expand Up @@ -141,27 +141,27 @@
<td
class="text-center">
<span
t-raw="'%s' % get_date(obj.generated_date) if get_date(obj.generated_date) else ''"/>
t-out="get_date(obj.generated_date) if get_date(obj.generated_date) else ''"/>
</td>
<td
class="text-center">
<span
t-raw="'%s' % obj.total_marks if obj.total_marks else ''"/>
t-out="obj.total_marks if obj.total_marks else ''"/>
/
<span
t-raw="'%s' % get_total(get_lines(obj)) if get_total(get_lines(obj)) else ''"/>
t-out="get_total(get_lines(obj)) if get_total(get_lines(obj)) else ''"/>
</td>

<td
class="text-center">
<span
t-raw="'%s' % obj.percentage if obj.percentage else ''"/>
t-out="obj.percentage if obj.percentage else ''"/>
%
</td>
<td
class="text-center">
<span
t-raw="'%s' % obj.status if obj.status else ''"/>
t-out="obj.status if obj.status else ''"/>
</td>
</tr>
</tbody>
Expand All @@ -181,7 +181,7 @@
<td>
:
<span
t-raw="'%s' % obj.student_id.name if obj.student_id.name else ''"/>
t-out="obj.student_id.name if obj.student_id.name else ''"/>
</td>
<td
width="15%">
Expand All @@ -191,7 +191,7 @@
<td>
:
<span
t-raw="'%s' % obj.marksheet_reg_id.exam_session_id.course_id.name if obj.marksheet_reg_id.exam_session_id.course_id.name else ''"/>
t-out="obj.marksheet_reg_id.exam_session_id.course_id.name if obj.marksheet_reg_id.exam_session_id.course_id.name else ''"/>
</td>
</tr>
<tr>
Expand All @@ -204,7 +204,7 @@
<td>
:
<span
t-raw="'%s' % obj.marksheet_reg_id.name if obj.marksheet_reg_id.name else ''"/>
t-out="obj.marksheet_reg_id.name if obj.marksheet_reg_id.name else ''"/>
</td>
<td
width="15%">
Expand All @@ -215,7 +215,7 @@
<td>
:
<span
t-raw="'%s' % obj.marksheet_reg_id.exam_session_id.exam_code if obj.marksheet_reg_id.exam_session_id.exam_code else ''"/>
t-out="obj.marksheet_reg_id.exam_session_id.exam_code if obj.marksheet_reg_id.exam_session_id.exam_code else ''"/>
</td>
</tr>
</tbody>
Expand Down Expand Up @@ -247,22 +247,22 @@
<td
class="text-left">
<span
t-raw="'%s' % result.exam_id.subject_id.name if result.exam_id.subject_id.name else ''"/>
t-out="result.exam_id.subject_id.name if result.exam_id.subject_id.name else ''"/>
</td>
<td
class="text-left">
<span
t-raw="'%s' % result.exam_id.session_id.exam_type.name if result.exam_id.session_id.exam_type.name else ''"/>
t-out="result.exam_id.session_id.exam_type.name if result.exam_id.session_id.exam_type.name else ''"/>
</td>
<td
class="text-center">
<span
t-raw="'%s' % result.grade if result.grade else '--'"/>
t-out="result.grade if result.grade else '--'"/>
</td>
<td
class="text-center">
<span
t-raw="'%s' % 'P' if result.marks &gt; 0 else 'A'"/>
t-out="'P' if result.marks &gt; 0 else 'A'"/>
</td>
</tr>
</t>
Expand Down Expand Up @@ -294,20 +294,20 @@
<td
class="text-center">
<span
t-raw="'%s' % get_date(obj.generated_date) if get_date(obj.generated_date) else ''"/>
t-out="get_date(obj.generated_date) if get_date(obj.generated_date) else ''"/>
</td>
<td class="text-center">
<span t-raw="'%s' % obj.grade if obj.grade else ''"/>
<span t-out="obj.grade if obj.grade else ''"/>
</td>
<td class="text-center">
<span
t-raw="'%s' % obj.percentage if obj.percentage else ''"/>
t-out="obj.percentage if obj.percentage else ''"/>
%
</td>
<td
class="text-center">
<span
t-raw="'%s' % obj.status if obj.status else ''"/>
t-out="obj.status if obj.status else ''"/>
</td>
</tr>
</tbody>
Expand Down
2 changes: 1 addition & 1 deletion openeducat_exam/tests/test_exam_common.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from odoo.tests import common


class TestExamCommon(common.SavepointCase):
class TestExamCommon(common.TransactionCase):
def setUp(self):
super(TestExamCommon, self).setUp()
self.op_exam = self.env['op.exam']
Expand Down
2 changes: 1 addition & 1 deletion openeducat_library/__manifest__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

{
'name': 'OpenEduCat Library',
'version': '14.0.1.0',
'version': '15.0.1.0',
'license': 'LGPL-3',
'category': 'Education',
"sequence": 3,
Expand Down
2 changes: 1 addition & 1 deletion openeducat_library/report/report_student_library_card.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
Library Card
</p>
<p style="color: #3087c3;font-weight: 600;font-size: 14px;margin: 0px 10px 10px;"
t-raw="'%s' % res_company.partner_id.name if res_company.partner_id.name else ''"/>
t-out="res_company.partner_id.name if res_company.partner_id.name else ''"/>
</td>
</tr>
<tr style="float: left;height: 2px;width: 100%;background-color: #2d4383;">
Expand Down
Loading

0 comments on commit d9c6705

Please sign in to comment.