Merge branch 'master' of github.com:ingadhoc/odoo-academic

Author: jjscarafia

addons/academic_reports/i18n/academic_reports.pot

@@ -209,7 +209,7 @@ def get_user_input_scores(self, domain, get_max_indicator_rel_scores = True):
             domain.append(('user_input_id.partner_id.disabled_person','!=',True))
         # Si no se especifica tener en cuenta evaluaciones de diagnostico, las sacamos del analisis
         if not include_diagnosis_eval:
-            domain.append(('user_input_id.survey_id.is_diagnosis','!=',True))
+            domain.append(('user_input_id.survey_id.is_diagnosis','=',False))
         if period_ids:
             domain.append(('question_id.survey_id.period_id','in',period_ids))
         if company_id:

addons/academic_reports/i18n/es_AR.po

@@ -4,7 +4,7 @@
 
 class academic_evaluation_analysis(models.Model):
     _name = "academic.evaluation.analysis"
-    _description = "Academic Evaluation Analysis"
+    _description = "Evaluation Analysis"
     _auto = False
 
     # Survey Fields
@@ -23,6 +23,7 @@ class academic_evaluation_analysis(models.Model):
     dont_consider = fields.Boolean('Don not Consider?')
     input_state = fields.Selection([('done', 'Finished '),('skip', 'Not Finished')], 'Status', readonly=True)
     group_id = fields.Many2one('academic.group', 'Group', readonly=True,)
+    course_level_id = fields.Many2one('academic.level', 'Course Level', readonly=True,)
     partner_id = fields.Many2one('res.partner', 'Partner', readonly=True,)
     company_id = fields.Many2one('res.company', 'Company', readonly=True,)
     avg_score = fields.Float('Avg Score', readonly=True, group_operator='avg',)
@@ -35,14 +36,15 @@ def init(self, cr):
             create or replace view academic_evaluation_analysis as (
 SELECT
         survey_user_input_question_score.id as id,
-        survey_user_input_question_score.score_percentage as avg_score, 
-        survey_user_input_question_score.score_percentage as min_score, 
-        survey_user_input_question_score.score_percentage as max_score, 
+        survey_user_input.score as avg_score, 
+        survey_user_input.score as min_score, 
+        survey_user_input.score as max_score, 
         survey_user_input.survey_id as survey_id,
         survey_user_input.partner_id as partner_id,
         survey_user_input.state as input_state,
         academic_observation_category.dont_consider as dont_consider,
         academic_group_evaluation.group_id as group_id,
+        academic_group.level_id as course_level_id,
         academic_group_evaluation.state as group_evaluation_state,
         academic_group.company_id,
         res_partner.disabled_person as disabled_person,
@@ -61,7 +63,9 @@ def init(self, cr):
     LEFT JOIN academic_observation_category
     on survey_user_input.observation_category_id = academic_observation_category.id
     INNER JOIN res_partner
-    on survey_user_input.partner_id = res_partner.id    
+    on survey_user_input.partner_id = res_partner.id
+    LEFT JOIN academic_level
+    on academic_group.level_id = academic_level.id    
         )
         """)
 

addons/academic_reports/report/division_analysis.py

@@ -33,7 +33,7 @@
                 <separator/>
                 <filter string="Excluir Personas con Discapacidad" name="exclude_disable_partners" domain="[('disabled_person','=',False)]"/>
                 <separator/>
-                <field name="survey_id"/>
+                <field name="survey_id" string="Evaluación"/>
                 <field name="period_id"/>
                 <field name="partner_id"/>
                 <field name="group_id"/>
@@ -43,8 +43,9 @@
                     <filter string="Partner" name="Partner" context="{'group_by':'partner_id'}"/>
                     <filter string="Company" groups="base.group_multi_company" name="User" context="{'group_by':'company_id'}"/>
                     <filter string="Group" name="User" context="{'group_by':'group_id'}"/>
+                    <filter string="Course Level" name="User" context="{'group_by':'course_level_id'}"/>
                     <filter string="Evaluation" name="survey_id" context="{'group_by':'survey_id'}"/>
-                    <filter string="Period" name="period_id" context="{'group_by':'survey_id'}"/>
+                    <filter string="Period" name="period_id" context="{'group_by':'period_id'}"/>
                 </group>
             </search>
         </field>

addons/academic_reports/report/evaluation_analysis.py

@@ -4,7 +4,7 @@
 
 class academic_evaluation_report(models.Model):
     _name = "academic.evaluation.report"
-    _description = "Academic Evaluation Report"
+    _description = "Question_Analysis"
     _auto = False
 
     # Survey Fields
@@ -24,6 +24,7 @@ class academic_evaluation_report(models.Model):
     dont_consider = fields.Boolean('Don not Consider?')
     input_state = fields.Selection([('done', 'Finished '),('skip', 'Not Finished')], 'Status', readonly=True)
     group_id = fields.Many2one('academic.group', 'Group', readonly=True,)
+    course_level_id = fields.Many2one('academic.level', 'Course Level', readonly=True,)
     partner_id = fields.Many2one('res.partner', 'Partner', readonly=True,)
     company_id = fields.Many2one('res.company', 'Company', readonly=True,)
     input_avg_score = fields.Float('Avg Score', readonly=True, group_operator='avg',)
@@ -55,6 +56,7 @@ def init(self, cr):
         academic_group_evaluation.group_id as group_id,
         academic_group_evaluation.state as group_evaluation_state,
         academic_group.company_id,
+        academic_group.level_id as course_level_id,
         academic_observation_category.dont_consider as dont_consider,
         survey_survey.is_evaluation as is_evaluation,
         survey_survey.stage_id as survey_stage_id,
@@ -73,7 +75,9 @@ def init(self, cr):
     LEFT JOIN academic_observation_category
     on survey_user_input.observation_category_id = academic_observation_category.id        
     INNER JOIN res_partner
-    on survey_user_input.partner_id = res_partner.id            
+    on survey_user_input.partner_id = res_partner.id
+    LEFT JOIN academic_level
+    on academic_group.level_id = academic_level.id            
     WHERE survey_survey.evaluation_subtype = 'student_evaluation'
         )
         """)

addons/academic_reports/report/evaluation_analysis_view.xml

@@ -36,20 +36,22 @@
                 <separator/>
                 <filter string="Excluir Personas con Discapacidad" name="exclude_disable_partners" domain="[('disabled_person','=',False)]"/>
                 <separator/>
-                <field name="survey_id"/>
+                <field name="survey_id" string="Evaluación"/>
                 <field name="question_id"/>
                 <field name="partner_id"/>
                 <field name="company_id" groups="base.group_multi_company"/>
                 <field name="group_id"/>
+                <field name="period_id"/>
                 <field name="survey_stage_id"/>
                 <field name="input_state"/>
                 <separator/>
                 <group expand="1" string="Group By...">
                     <filter string="Partner" name="Partner" context="{'group_by':'partner_id'}"/>
                     <filter string="Company" groups="base.group_multi_company" name="User" context="{'group_by':'company_id'}"/>
                     <filter string="Group" name="User" context="{'group_by':'group_id'}"/>
+                    <filter string="Course Level" name="User" context="{'group_by':'course_level_id'}"/>
                     <filter string="Evaluation" name="survey_id" context="{'group_by':'survey_id'}"/>
-                    <filter string="Period" name="period_id" context="{'group_by':'survey_id'}"/>                    
+                    <filter string="Period" name="period_id" context="{'group_by':'period_id'}"/>                    
                     <filter string="Question" name="question_id" context="{'group_by':'question_id'}"/>
                     <filter string="Objective" name="objective_id" context="{'group_by':'objective_id'}"/>
                     <filter string="Level" name="level_id" context="{'group_by':'level_id'}"/>

addons/academic_reports/report/evaluation_report.py

@@ -3,3 +3,4 @@ access_academic_division_analysis_global,academic_reports.academic_division_anal
 access_academic_division_analysis_user,academic_reports.academic_division_analysis_user,academic_reports.model_academic_division_analysis,academic.group_user,1,0,0,0
 access_academic_division_analysis_manager,academic_reports.academic_division_analysis_manager,academic_reports.model_academic_division_analysis,academic.group_manager,1,1,1,1
 access_academic_evaluation_analysis_global,academic_reports.academic_evaluation_analysis_global,academic_reports.model_academic_evaluation_analysis,,1,1,1,1
+access_academic_evaluation_report_global,academic_reports.academic_evaluation_report_global,academic_reports.model_academic_evaluation_report,,1,1,1,1