Merge pull request openeducat#56 from ajaychauhan727/9.0

[REL] OpenEduCat v9.0.2.4.0

Author: parthivgls

openeducat_achievement/__openerp__.py

@@ -21,7 +21,7 @@
 
 {
     'name': 'OpenEduCat Achievement',
-    'version': '2.3.0',
+    'version': '2.4.0',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Achievement',

openeducat_activity/__openerp__.py

@@ -21,7 +21,7 @@
 
 {
     'name': 'OpenEduCat Activity',
-    'version': '2.3.0',
+    'version': '2.4.0',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Activities',

openeducat_admission/__openerp__.py

@@ -21,7 +21,7 @@
 
 {
     'name': "OpenEduCat Admission",
-    'version': '2.3.0',
+    'version': '2.4.0',
     'category': 'Openerp Education',
     'sequence': 3,
     'summary': "Manage Admissions""",

openeducat_admission/models/admission.py

@@ -115,6 +115,10 @@ def onchange_register(self):
         self.course_id = self.register_id.course_id
         self.fees = self.register_id.product_id.lst_price
 
+    @api.onchange('course_id')
+    def onchange_course(self):
+        self.batch_id = False
+
     @api.one
     @api.constrains('register_id', 'application_date')
     def _check_admission_register(self):
@@ -126,6 +130,13 @@ def _check_admission_register(self):
                 "Application Date should be between Start Date & \
                 End Date of Admission Register.")
 
+    @api.one
+    @api.constrains('birth_date')
+    def _check_birthdate(self):
+        if self.birth_date > fields.Date.today():
+            raise ValidationError(
+                "Birth Date can't be greater than current date!")
+
     @api.one
     def confirm_in_progress(self):
         self.state = 'confirm'

openeducat_admission/models/admission_register.py

@@ -22,6 +22,7 @@
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from openerp import models, fields, api
+from openerp.exceptions import ValidationError
 
 
 class OpAdmissionRegister(models.Model):
@@ -60,6 +61,23 @@ class OpAdmissionRegister(models.Model):
          ('admission', 'Admission Process'), ('done', 'Done')],
         'Status',  default='draft', track_visibility='onchange')
 
+    @api.one
+    @api.constrains('start_date', 'end_date')
+    def check_dates(self):
+        start_date = fields.Date.from_string(self.start_date)
+        end_date = fields.Date.from_string(self.end_date)
+        if start_date > end_date:
+            raise ValidationError("End Date cannot be set before Start Date.")
+
+    @api.one
+    @api.constrains('min_count', 'max_count')
+    def check_no_of_admission(self):
+        if (self.min_count < 0) or (self.max_count < 0):
+            raise ValidationError("No of Admission should be positive!")
+        if self.min_count > self.max_count:
+            raise ValidationError(
+                "Min Admission can't be greater than Max Admission")
+
     @api.one
     def confirm_register(self):
         self.state = 'confirm'

openeducat_admission/views/admission_view.xml

@@ -66,12 +66,12 @@
                         <notebook colspan="4">
                             <page name="admission_detail" string="Admission Detail">
                                 <group col="4" colspan="4">
-                                    <field name="register_id" domain="[('state', '=', 'application')]" widget="selection" />
+                                    <field name="register_id" domain="[('state', 'in', ['application','admission','done'])]" widget="selection" />
                                     <field name="application_number" />
                                     <field name="application_date" />
                                     <field name="admission_date" />
                                     <field name="course_id" />
-                                    <field name="batch_id" domain="[('course_id', '=', course_id)]" />
+                                    <field name="batch_id" context="{'course_id': course_id,'get_parent_batch':1}" />
                                     <field name="fees" />
                                     <field name="due_date" />
                                 </group>

openeducat_admission/wizard/admission_analysis_wizard.py

@@ -20,8 +20,8 @@
 ###############################################################################
 
 import time
-
 from openerp import models, fields, api
+from openerp.exceptions import ValidationError
 
 
 class AdmissionAnalysis(models.TransientModel):
@@ -36,10 +36,16 @@ class AdmissionAnalysis(models.TransientModel):
 
     @api.multi
     def print_report(self):
-        data = self.read(
-            ['course_id', 'start_date', 'end_date'])[0]
-        return self.env['report'].get_action(
-            self, 'openeducat_admission.report_admission_analysis', data=data)
+        start_date = fields.Date.from_string(self.start_date)
+        end_date = fields.Date.from_string(self.end_date)
+        if start_date > end_date:
+            raise ValidationError("End Date cannot be set before Start Date.")
+        else:
+            data = self.read(
+                ['course_id', 'start_date', 'end_date'])[0]
+            return self.env['report'].get_action(
+                self, 'openeducat_admission.report_admission_analysis',
+                data=data)
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

openeducat_alumni/__openerp__.py

@@ -21,7 +21,7 @@
 
 {
     'name': 'OpenEduCat Alumni',
-    'version': '2.3.0',
+    'version': '2.4.0',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Alumni',

openeducat_assignment/__openerp__.py

@@ -21,7 +21,7 @@
 
 {
     'name': 'OpenEduCat Assignment',
-    'version': '2.3.0',
+    'version': '2.4.0',
     'category': 'Openerp Education',
     "sequence": 3,
     'summary': 'Manage Assgiments',

openeducat_assignment/models/assignment.py

@@ -20,6 +20,7 @@
 ###############################################################################
 
 from openerp import models, fields, api
+from openerp.exceptions import ValidationError
 
 
 class OpAssignment(models.Model):
@@ -29,9 +30,12 @@ class OpAssignment(models.Model):
 
     name = fields.Char('Name', size=16, required=True)
     course_id = fields.Many2one('op.course', 'Course', required=True)
-    batch_id = fields.Many2one('op.batch', 'Batch')
+    batch_id = fields.Many2one('op.batch', 'Batch', required=True)
     subject_id = fields.Many2one('op.subject', 'Subject', required=True)
-    faculty_id = fields.Many2one('op.faculty', 'Faculty', required=True)
+    faculty_id = fields.Many2one(
+        'op.faculty', 'Faculty', default=lambda self: self.env[
+            'op.faculty'].search([('user_id', '=', self.env.uid)]),
+        required=True)
     assignment_type_id = fields.Many2one(
         'op.assignment.type', 'Assignment Type', required=True)
     marks = fields.Float('Marks', track_visibility='onchange')
@@ -51,6 +55,19 @@ class OpAssignment(models.Model):
         'op.assignment.sub.line', 'assignment_id', 'Submissions')
     reviewer = fields.Many2one('op.faculty', 'Reviewer')
 
+    @api.one
+    @api.constrains('issued_date', 'submission_date')
+    def check_dates(self):
+        issued_date = fields.Date.from_string(self.issued_date)
+        submission_date = fields.Date.from_string(self.submission_date)
+        if issued_date > submission_date:
+            raise ValidationError(
+                "Submission Date cannot be set before Issue Date.")
+
+    @api.onchange('course_id')
+    def onchange_course(self):
+        self.batch_id = False
+
     @api.one
     def act_publish(self):
         self.state = 'publish'