Skip to content

Commit 8286315

Browse files
ketul-1997parthivgls
ketul-1997
authored and
parthivgls
committed
[MODIFIED]:web_openeducat: modified website view (openeducat#338)
1 parent 7d158f0 commit 8286315

File tree

17 files changed

+663
-580
lines changed

17 files changed

+663
-580
lines changed

‎openeducat_exam/demo/exam_demo.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<record id="op_exam_9" model="op.exam">
121121
<field name="exam_code">ilts-1</field>
122122
<field name="name">IELTS-E1-D1</field>
123-
<field name="state">done</field>
123+
<field name="state">schedule</field>
124124
<field name="min_marks">35</field>
125125
<field name="total_marks">70</field>
126126
<field name="session_id" ref="op_exam_session_3"/>
@@ -134,7 +134,7 @@
134134
<record id="op_exam_10" model="op.exam">
135135
<field name="exam_code">ilts-2</field>
136136
<field name="name">IELTS-E1-D2</field>
137-
<field name="state">done</field>
137+
<field name="state">held</field>
138138
<field name="min_marks">35</field>
139139
<field name="total_marks">70</field>
140140
<field name="session_id" ref="op_exam_session_3"/>
@@ -148,7 +148,7 @@
148148
<record id="op_exam_11" model="op.exam">
149149
<field name="exam_code">ilts-3</field>
150150
<field name="name">IELTS-E1-D3</field>
151-
<field name="state">done</field>
151+
<field name="state">result_updated</field>
152152
<field name="min_marks">35</field>
153153
<field name="total_marks">70</field>
154154
<field name="session_id" ref="op_exam_session_3"/>

‎openeducat_exam/models/marksheet_line.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ def _compute_grade(self):
7979
if grade.min_per <= record.percentage and \
8080
grade.max_per >= record.percentage:
8181
record.grade = grade.result
82+
else :
83+
record.grade = None
8284
else :
8385
record.grade = None
8486

‎openeducat_exam/models/result_template.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ def generate_result(self):
7777
'exam_session_id': record.exam_session_id.id,
7878
'generated_date': fields.Date.today(),
7979
'generated_by': self.env.uid,
80-
'status': 'draft',
80+
'state': 'draft',
8181
'result_template_id': record.id
8282
})
8383
student_dict = {}

‎openeducat_fees/demo/student_fees_details_demo.xml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<field name="student_id" ref="openeducat_core.op_student_1"/>
88
<field name="product_id" ref="op_product_1"/>
99
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_1"/>
10-
<field name="date" eval="'%s-05-17' %(datetime.now().year-1)"/>
10+
<field name="date" eval="'%s-05-17' %(datetime.now().year)"/>
1111
</record>
1212

1313
<record id="op_student_fees_details_2" model="op.student.fees.details">
@@ -16,7 +16,7 @@
1616
<field name="student_id" ref="openeducat_core.op_student_1"/>
1717
<field name="product_id" ref="op_product_1"/>
1818
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_2"/>
19-
<field name="date" eval="'%s-06-03' %(datetime.now().year-1)"/>
19+
<field name="date" eval="'%s-06-03' %(datetime.now().year)"/>
2020
</record>
2121

2222
<record id="op_student_fees_details_3" model="op.student.fees.details">
@@ -25,7 +25,7 @@
2525
<field name="student_id" ref="openeducat_core.op_student_1"/>
2626
<field name="product_id" ref="op_product_1"/>
2727
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_3"/>
28-
<field name="date" eval="'%s-07-03' %(datetime.now().year-1)"/>
28+
<field name="date" eval="'%s-07-03' %(datetime.now().year)"/>
2929
</record>
3030

3131
<record id="op_student_fees_details_4" model="op.student.fees.details">
@@ -34,7 +34,7 @@
3434
<field name="student_id" ref="openeducat_core.op_student_2"/>
3535
<field name="product_id" ref="op_product_1"/>
3636
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_1"/>
37-
<field name="date" eval="'%s-05-28' %(datetime.now().year-1)"/>
37+
<field name="date" eval="'%s-05-28' %(datetime.now().year)"/>
3838
</record>
3939

4040
<record id="op_student_fees_details_5" model="op.student.fees.details">
@@ -43,7 +43,7 @@
4343
<field name="student_id" ref="openeducat_core.op_student_2"/>
4444
<field name="product_id" ref="op_product_1"/>
4545
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_2"/>
46-
<field name="date" eval="'%s-06-12' %(datetime.now().year-1)"/>
46+
<field name="date" eval="'%s-06-12' %(datetime.now().year)"/>
4747
</record>
4848

4949
<record id="op_student_fees_details_6" model="op.student.fees.details">
@@ -52,7 +52,7 @@
5252
<field name="student_id" ref="openeducat_core.op_student_2"/>
5353
<field name="product_id" ref="op_product_1"/>
5454
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_3"/>
55-
<field name="date" eval="'%s-07-12' %(datetime.now().year-1)"/>
55+
<field name="date" eval="'%s-07-12' %(datetime.now().year)"/>
5656
</record>
5757

5858
<record id="op_student_fees_details_7" model="op.student.fees.details">
@@ -61,7 +61,7 @@
6161
<field name="student_id" ref="openeducat_core.op_student_3"/>
6262
<field name="product_id" ref="op_product_1"/>
6363
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_1"/>
64-
<field name="date" eval="'%s-06-04' %(datetime.now().year-1)"/>
64+
<field name="date" eval="'%s-06-04' %(datetime.now().year)"/>
6565
</record>
6666

6767
<record id="op_student_fees_details_8" model="op.student.fees.details">
@@ -70,7 +70,7 @@
7070
<field name="student_id" ref="openeducat_core.op_student_3"/>
7171
<field name="product_id" ref="op_product_1"/>
7272
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_2"/>
73-
<field name="date" eval="'%s-06-18' %(datetime.now().year-1)"/>
73+
<field name="date" eval="'%s-06-18' %(datetime.now().year)"/>
7474
</record>
7575

7676
<record id="op_student_fees_details_9" model="op.student.fees.details">
@@ -79,7 +79,7 @@
7979
<field name="student_id" ref="openeducat_core.op_student_3"/>
8080
<field name="product_id" ref="op_product_1"/>
8181
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_3"/>
82-
<field name="date" eval="'%s-07-24' %(datetime.now().year-1)"/>
82+
<field name="date" eval="'%s-07-24' %(datetime.now().year)"/>
8383
</record>
8484

8585
<record id="op_student_fees_details_10" model="op.student.fees.details">
@@ -88,7 +88,7 @@
8888
<field name="student_id" ref="openeducat_core.op_student_4"/>
8989
<field name="product_id" ref="op_product_1"/>
9090
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_1"/>
91-
<field name="date" eval="'%s-05-24' %(datetime.now().year-1)"/>
91+
<field name="date" eval="'%s-05-24' %(datetime.now().year)"/>
9292
</record>
9393

9494
<record id="op_student_fees_details_11" model="op.student.fees.details">
@@ -97,7 +97,7 @@
9797
<field name="student_id" ref="openeducat_core.op_student_4"/>
9898
<field name="product_id" ref="op_product_1"/>
9999
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_2"/>
100-
<field name="date" eval="'%s-06-08' %(datetime.now().year-1)"/>
100+
<field name="date" eval="'%s-06-08' %(datetime.now().year)"/>
101101
</record>
102102

103103
<record id="op_student_fees_details_12" model="op.student.fees.details">
@@ -106,7 +106,7 @@
106106
<field name="student_id" ref="openeducat_core.op_student_4"/>
107107
<field name="product_id" ref="op_product_1"/>
108108
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_3"/>
109-
<field name="date" eval="'%s-07-08' %(datetime.now().year-1)"/>
109+
<field name="date" eval="'%s-07-08' %(datetime.now().year)"/>
110110
</record>
111111

112112
<record id="op_student_fees_details_13" model="op.student.fees.details">
@@ -115,7 +115,7 @@
115115
<field name="student_id" ref="openeducat_core.op_student_9"/>
116116
<field name="product_id" ref="op_product_3"/>
117117
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_4"/>
118-
<field name="date" eval="'%s-06-11' %(datetime.now().year-1)"/>
118+
<field name="date" eval="'%s-06-11' %(datetime.now().year)"/>
119119
</record>
120120

121121
<record id="op_student_fees_details_14" model="op.student.fees.details">
@@ -124,7 +124,7 @@
124124
<field name="student_id" ref="openeducat_core.op_student_9"/>
125125
<field name="product_id" ref="op_product_3"/>
126126
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_5"/>
127-
<field name="date" eval="'%s-07-11' %(datetime.now().year-1)"/>
127+
<field name="date" eval="'%s-07-11' %(datetime.now().year)"/>
128128
</record>
129129

130130
<record id="op_student_fees_details_15" model="op.student.fees.details">
@@ -133,7 +133,7 @@
133133
<field name="student_id" ref="openeducat_core.op_student_10"/>
134134
<field name="product_id" ref="op_product_3"/>
135135
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_4"/>
136-
<field name="date" eval="'%s-06-16' %(datetime.now().year-1)"/>
136+
<field name="date" eval="'%s-06-16' %(datetime.now().year)"/>
137137
</record>
138138

139139
<record id="op_student_fees_details_16" model="op.student.fees.details">
@@ -142,7 +142,7 @@
142142
<field name="student_id" ref="openeducat_core.op_student_10"/>
143143
<field name="product_id" ref="op_product_3"/>
144144
<field name="fees_line_id" ref="openeducat_fees.op_fees_term_line_5"/>
145-
<field name="date" eval="'%s-07-16' %(datetime.now().year-1)"/>
145+
<field name="date" eval="'%s-07-16' %(datetime.now().year)"/>
146146
</record>
147147
</data>
148148
</odoo>

‎openeducat_library/demo/media_queue_demo.xml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,36 +4,36 @@
44
<record id="op_media_queue_1" model="op.media.queue">
55
<field name="media_id" ref="op_media_3"/>
66
<field name="state">request</field>
7-
<field name="date_from">2015-04-13</field>
8-
<field name="date_to">2015-04-22</field>
7+
<field name="date_from" eval="'%s-04-13' %(datetime.now().year)"/>
8+
<field name="date_to" eval="'%s-04-22' %(datetime.now().year)"/>
99
</record>
1010

1111
<record id="op_media_queue_2" model="op.media.queue">
1212
<field name="media_id" ref="op_media_3"/>
1313
<field name="state">request</field>
14-
<field name="date_from">2015-10-01</field>
15-
<field name="date_to">2015-10-15</field>
14+
<field name="date_from" eval="'%s-10-01' %(datetime.now().year)"/>
15+
<field name="date_to" eval="'%s-10-15' %(datetime.now().year)"/>
1616
</record>
1717

1818
<record id="op_media_queue_3" model="op.media.queue">
1919
<field name="media_id" ref="op_media_3"/>
2020
<field name="state">request</field>
21-
<field name="date_from">2015-06-08</field>
22-
<field name="date_to">2015-06-25</field>
21+
<field name="date_from" eval="'%s-06-08' %(datetime.now().year)"/>
22+
<field name="date_to" eval="'%s-06-25' %(datetime.now().year)"/>
2323
</record>
2424

2525
<record id="op_media_queue_4" model="op.media.queue">
2626
<field name="media_id" ref="op_media_3"/>
2727
<field name="state">request</field>
28-
<field name="date_from">2015-05-01</field>
29-
<field name="date_to">2015-05-19</field>
28+
<field name="date_from" eval="'%s-05-01' %(datetime.now().year)"/>
29+
<field name="date_to" eval="'%s-05-19' %(datetime.now().year)"/>
3030
</record>
3131

3232
<record id="op_media_queue_5" model="op.media.queue">
3333
<field name="media_id" ref="op_media_3"/>
3434
<field name="state">accept</field>
35-
<field name="date_from">2015-07-01</field>
36-
<field name="date_to">2015-07-29</field>
35+
<field name="date_from" eval="'%s-07-01' %(datetime.now().year)"/>
36+
<field name="date_to" eval="'%s-07-29' %(datetime.now().year)"/>
3737
</record>
3838
</data>
3939
</odoo>

‎web_openeducat/__manifest__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
'views/snippets/event.xml',
3939
'views/snippets/newsfeed.xml',
4040
'views/snippets/footer.xml',
41+
'views/image_library.xml'
4142
],
4243
'demo': [
4344
'data/homepage_demo.xml',

‎web_openeducat/data/homepage_demo.xml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -898,14 +898,5 @@
898898
</t>
899899
</field>
900900
</record>
901-
<record id="home_option_1_demo_page" model="website.page">
902-
<field name="name">Home</field>
903-
<field name="url">/home-option-1</field>
904-
<field name="view_id" ref="web_openeducat.home_page"/>
905-
<field name="website_indexed">True</field>
906-
<field name="website_published">True</field>
907-
<field name="website_id" ref="website.default_website"/>
908-
<field name="is_homepage">True</field>
909-
</record>
910901
</data>
911902
</odoo>

0 commit comments

Comments
 (0)