Merge branch '9.0' of https://github.com/openeducat/openeducat_erp

openeducat_achievement/__init__.py

@@ -20,6 +20,3 @@
 ##############################################################################
 
 from . import models
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_achievement/__openerp__.py

@@ -21,7 +21,8 @@
 
 {
     'name': 'OpenEduCat Achievement',
-    'version': '2.0.0',
+    'version': '9.0.2.4.0',
+    'license': 'LGPL-3',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Achievement',
@@ -38,10 +39,14 @@
         'security/ir.model.access.csv',
         'achievement_menu.xml',
     ],
+    'images': [
+        'static/description/openeducat_achievement_banner.jpg',
+    ],
+    'demo': [
+        'demo/achievement_type_demo.xml',
+        'demo/achievement_demo.xml',
+    ],
     'installable': True,
     'auto_install': False,
     'application': True,
 }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_achievement/achievement_menu.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
+<odoo>
     <data>
         <menuitem id="menu_op_achievement_type_sub" name="Achievement Types"
-            parent="openeducat_core.menu_op_school_config_activity" sequence="30"
+            parent="openeducat_core.menu_op_school_config_activity" sequence="20"
             action="act_open_op_achievement_type_view" groups="openeducat_core.group_op_back_office_admin" />
 
         <menuitem id="menu_op_achievement_main" name="Achievements"
-            parent="openeducat_core.menu_op_general_main" sequence="60"
+            parent="openeducat_core.menu_op_general_student" sequence="20"
             action="act_open_op_achievement_view" groups="openeducat_core.group_op_back_office,openeducat_core.group_op_back_office_admin" />
     </data>
-</openerp>
+</odoo>

openeducat_achievement/demo/achievement_demo.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="op_achievement_1" model="op.achievement">
+            <field name="description">Got first rank in paper presentation at
+                tech first.
+            </field>
+            <field name="achievement_date"
+                eval="(DateTime.today() - relativedelta(months=2)).strftime('%Y-%m-14 %H:%M')" />
+            <field name="faculty_id" ref="openeducat_core.op_faculty_6" />
+            <field name="student_id" ref="openeducat_core.op_student_1" />
+            <field name="achievement_type" ref="op_achievement_type_2" />
+        </record>
+
+        <record id="op_achievement_2" model="op.achievement">
+            <field name="description">Got gold medal in national level
+                competition.
+            </field>
+            <field name="achievement_date"
+                eval="(DateTime.today() - relativedelta(months=3)).strftime('%Y-%m-22 %H:%M')" />
+            <field name="faculty_id" ref="openeducat_core.op_faculty_1" />
+            <field name="student_id" ref="openeducat_core.op_student_6" />
+            <field name="achievement_type" ref="op_achievement_type_1" />
+        </record>
+
+        <record id="op_achievement_3" model="op.achievement">
+            <field name="description">Got first rank in code master at tech
+                first.
+            </field>
+            <field name="achievement_date"
+                eval="(DateTime.today() - relativedelta(months=10)).strftime('%Y-%m-03 %H:%M')" />
+            <field name="faculty_id" ref="openeducat_core.op_faculty_3" />
+            <field name="student_id" ref="openeducat_core.op_student_20" />
+            <field name="achievement_type" ref="op_achievement_type_2" />
+        </record>
+
+    </data>
+</odoo>

openeducat_achievement/demo/achievement_type_demo.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="op_achievement_type_1" model="op.achievement.type">
+            <field name="name">Gold Medal</field>
+            <field name="code">gm</field>
+        </record>
+        <record id="op_achievement_type_2" model="op.achievement.type">
+            <field name="name">First Rank in National Level Event</field>
+            <field name="code">nle</field>
+        </record>
+
+    </data>
+</odoo>

openeducat_achievement/models/__init__.py

@@ -21,5 +21,3 @@
 
 from . import achievement
 from . import achievement_type
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_achievement/models/achievement.py

@@ -31,6 +31,5 @@ class OpAchievement(models.Model):
     achievement_type = fields.Many2one(
         'op.achievement.type', 'Achievement Type', required=True)
     description = fields.Text('Description', required=True)
-    achievement_date = fields.Date('Date', required=True)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    achievement_date = fields.Date(
+        'Date', required=True, default=fields.Date.today())

openeducat_achievement/models/achievement_type.py

@@ -27,5 +27,3 @@ class OpAchievementType(models.Model):
 
     name = fields.Char('Name', size=256, required=True)
     code = fields.Char('Code', size=4, required=True)
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_achievement/static/description/index.html

@@ -0,0 +1,58 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">OpenEduCat Achievement</h2>
+            <h3 class="oe_slogan">Manage student achievements</h3>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                <a href="http://openeducat.org/demo"> <img
+                    src="openeducat_logo.png">
+                </a>
+                <div class="oe_demo_footer oe_centeralign">Online Demo</div>
+            </div>
+        </div>
+        <div class="oe_span6">
+            <p class="oe_mt32">Manage achievement details for students. Track achievement of student by type, date & other details.</p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openeducat.org/contactus/"
+                    class="oe_button oe_big oe_tacky">Contact Us</a>
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Student Achievement Information</h2>
+        <div class="oe_span6">
+            <p class="oe_mt32">Maintain all information of student's achievements, achievement types
+            and much more.</p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="achievement.png">
+            </div>
+        </div>
+    </div>
+</section>
+
+<section class="jumbotron"
+    style="color: white; background-color: #606061;">
+    <div class="container">
+        <div class="row">
+            <div class="col-md-9">
+                <p class="mt16">
+                    <strong>Need help or just looking for more information on OpenEduCat ? 
+                            We are ready and waiting for your questions.</strong>
+                </p>
+            </div>
+            <div class="col-md-3">
+                <a class="btn btn-primary btn-lg pull-right mt8"
+                    style="color: #FFFFFF !important;"
+                    href="https://www.openeducat.org/page/website.contactus"><i
+                    class="fa fa-arrow-right"></i> Contact Us Now </a>
+            </div>
+        </div>
+    </div>
+</section>

openeducat_achievement/views/achievement_type_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
+<odoo>
     <data>
         <record id="view_op_achievement_type_tree" model="ir.ui.view">
             <field name="name">op.achievement.type.tree</field>
@@ -68,4 +68,4 @@
             <field name="view_id" ref="view_op_achievement_type_tree" />
         </record>
     </data>
-</openerp>
+</odoo>

openeducat_achievement/views/achievement_view.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
+<odoo>
     <data>
         <record id="view_op_achievement_tree" model="ir.ui.view">
             <field name="name">op.achievement.tree</field>
@@ -28,7 +28,9 @@
                                 <field name="faculty_id" />
                                 <field name="achievement_type" />
                                 <field name="achievement_date" />
-                                <field name="description" colspan="4" />
+                            </group>
+                            <group string="Description">
+                                <field name="description" nolabel="1" />
                             </group>
                         </div>
                     </sheet>
@@ -83,4 +85,4 @@
             <field name="view_id" ref="view_op_achievement_tree" />
         </record>
     </data>
-</openerp>
+</odoo>

openeducat_activity/__init__.py

@@ -21,6 +21,3 @@
 
 from . import models
 from . import wizard
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_activity/__openerp__.py

@@ -21,7 +21,8 @@
 
 {
     'name': 'OpenEduCat Activity',
-    'version': '2.0.0',
+    'version': '9.0.2.4.0',
+    'license': 'LGPL-3',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Activities',
@@ -41,10 +42,14 @@
         'views/student_view.xml',
         'activity_menu.xml'
     ],
+    'demo': [
+        'demo/activity_type_demo.xml',
+        'demo/activity_demo.xml',
+    ],
+    'images': [
+        'static/description/openeducat_activity_banner.jpg',
+    ],
     'installable': True,
     'auto_install': False,
     'application': True,
 }
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_activity/activity_menu.xml

@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<openerp>
+<odoo>
     <data>
         <menuitem id="menu_op_activity_sub" name="Activity Logs"
-            parent="openeducat_core.menu_op_school_config_activity" sequence="10"
+            parent="openeducat_core.menu_op_general_student" sequence="10"
             action="act_open_op_activity_view" groups="openeducat_core.group_op_back_office_admin" />
         <menuitem id="menu_op_activity_type_sub" name="Activity Types"
-            parent="openeducat_core.menu_op_school_config_activity" sequence="20"
+            parent="openeducat_core.menu_op_school_config_activity" sequence="10"
             action="act_open_op_activity_type_view" groups="openeducat_core.group_op_back_office,openeducat_core.group_op_back_office_admin" />
 
-        <menuitem id="menu_student_migrate" name="Student Migratation"
-            parent="openeducat_core.menu_op_general_main" sequence="50"
+        <menuitem id="menu_student_migrate" name="Student Migration"
+            parent="openeducat_core.menu_op_general_main" sequence="30"
             action="act_open_student_migrate_view" groups="openeducat_core.group_op_back_office,openeducat_core.group_op_back_office_admin" />
     </data>
-</openerp>
+</odoo>
+

openeducat_activity/demo/activity_demo.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <record id="op_activity_1" model="op.activity">
+            <field name="description">Migrated in higher standard</field>
+            <field name="date"
+                eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-14 %H:%M')" />
+            <field name="faculty_id" ref="openeducat_core.op_faculty_1" />
+            <field name="student_id" ref="openeducat_core.op_student_1" />
+            <field name="type_id" ref="op_activity_type_1" />
+        </record>
+
+        <record id="op_activity_2" model="op.activity">
+            <field name="description">Reached 1 hour late</field>
+            <field name="date"
+                eval="(DateTime.today() - relativedelta(months=1)).strftime('%Y-%m-12 %H:%M')" />
+            <field name="faculty_id" ref="openeducat_core.op_faculty_2" />
+            <field name="student_id" ref="openeducat_core.op_student_2" />
+            <field name="type_id" ref="op_activity_type_2" />
+        </record>
+
+    </data>
+</odoo>

openeducat_activity/demo/activity_type_demo.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="op_activity_type_1" model="op.activity.type">
+            <field name="name">Migration</field>
+        </record>
+        <record id="op_activity_type_2" model="op.activity.type">
+            <field name="name">Late Application</field>
+        </record>
+        <record id="op_activity_type_3" model="op.activity.type">
+            <field name="name">Misbehaviour</field>
+        </record>
+    </data>
+</odoo>

openeducat_activity/models/__init__.py

@@ -22,6 +22,3 @@
 from . import activity
 from . import activity_type
 from . import student
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_activity/models/activity.py

@@ -25,11 +25,10 @@
 class OpActivity(models.Model):
     _name = 'op.activity'
     _rec_name = 'student_id'
+    _inherit = 'mail.thread'
 
     student_id = fields.Many2one('op.student', 'Student', required=True)
     faculty_id = fields.Many2one('op.faculty', 'Faculty')
     type_id = fields.Many2one('op.activity.type', 'Activity Type')
-    date = fields.Date('Date')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
+    description = fields.Text('Description')
+    date = fields.Date('Date', default=fields.Date.today())

openeducat_activity/models/activity_type.py

@@ -26,6 +26,3 @@ class OpActivityType(models.Model):
     _name = 'op.activity.type'
 
     name = fields.Char('Name', size=128, required=True)
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_activity/models/student.py

@@ -27,6 +27,3 @@ class OpStudent(models.Model):
 
     activity_log = fields.One2many(
         'op.activity', 'student_id', 'Activity Log')
-
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: