diff --git a/new_project/custom_addons/encoach_portal/controllers/portal.py b/new_project/custom_addons/encoach_portal/controllers/portal.py index f9fa5d0ab..d9275ba25 100644 --- a/new_project/custom_addons/encoach_portal/controllers/portal.py +++ b/new_project/custom_addons/encoach_portal/controllers/portal.py @@ -1,6 +1,6 @@ import json import logging -from odoo import http +from odoo import http, fields from odoo.http import request from odoo.addons.portal.controllers.portal import CustomerPortal @@ -41,6 +41,85 @@ class EncoachPortal(CustomerPortal): 'profile': profile, }) + # ------------------------------------------------------------------ + # JSON-RPC: /encoach/onboarding/goals (called by OWL wizard) + # ------------------------------------------------------------------ + @http.route('/encoach/onboarding/goals', type='json', auth='user') + def onboarding_goals_rpc(self, **kw): + Template = request.env['encoach.exam.template'].sudo() + templates = Template.search([('active', '=', True)]) + seen = set() + goals = [] + icon_map = { + 'ielts': 'fa-language', 'general_english': 'fa-comments', + 'general english': 'fa-comments', 'academic': 'fa-graduation-cap', + 'math': 'fa-calculator', 'mathematics': 'fa-calculator', + 'it': 'fa-laptop', 'information technology': 'fa-laptop', + } + for tpl in templates: + subj = tpl.subject_id + if subj and subj.name and subj.name.lower() not in seen: + seen.add(subj.name.lower()) + goal_id = subj.name.lower().replace(' ', '_') + goals.append({ + 'id': goal_id, + 'name': subj.name, + 'icon': icon_map.get(goal_id, icon_map.get(subj.name.lower(), 'fa-book')), + }) + if not goals: + goals = [ + {'id': 'ielts', 'name': 'IELTS Preparation', 'icon': 'fa-language'}, + {'id': 'general_english', 'name': 'General English', 'icon': 'fa-comments'}, + {'id': 'math', 'name': 'Mathematics', 'icon': 'fa-calculator'}, + {'id': 'it', 'name': 'Information Technology', 'icon': 'fa-laptop'}, + ] + return {'goals': goals} + + # ------------------------------------------------------------------ + # JSON-RPC: /encoach/onboarding/save (called by OWL wizard) + # ------------------------------------------------------------------ + @http.route('/encoach/onboarding/save', type='json', auth='user') + def onboarding_save_rpc(self, **kw): + user = request.env.user + goal = kw.get('goal') + target_level = kw.get('target_level') + study_preference = kw.get('study_preference') + skip_placement = kw.get('skip_placement', False) + learning_style = kw.get('learning_style') + hours_per_week = kw.get('hours_per_week', 0) + + placement_decision = 'skip' if skip_placement else 'take_now' + + profile_vals = { + 'user_id': user.id, + 'learning_goal': goal, + 'study_mode': study_preference, + 'hours_per_week': hours_per_week, + 'placement_decision': placement_decision, + } + + if learning_style: + if isinstance(learning_style, list): + profile_vals['learning_style'] = json.dumps(learning_style) + elif isinstance(learning_style, str): + profile_vals['learning_style'] = json.dumps([learning_style]) + + if skip_placement: + profile_vals['cefr_level'] = 'b1' + + Profile = request.env['encoach.student.profile'].sudo() + profile = Profile.search([('user_id', '=', user.id)], limit=1) + if profile: + profile.write(profile_vals) + else: + profile = Profile.create(profile_vals) + + user.sudo().write({ + 'account_status': 'activated', + 'first_login': False, + }) + return {'ok': True, 'profile_id': profile.id, 'placement_decision': placement_decision} + @http.route('/my/dashboard', type='http', auth='user', website=True) def student_dashboard(self, **kw): user = request.env.user diff --git a/new_project/custom_addons/encoach_portal/views/templates.xml b/new_project/custom_addons/encoach_portal/views/templates.xml index 2221ac386..d236d7d0a 100644 --- a/new_project/custom_addons/encoach_portal/views/templates.xml +++ b/new_project/custom_addons/encoach_portal/views/templates.xml @@ -249,7 +249,7 @@
-

+

@@ -512,7 +512,7 @@

-

+

@@ -554,7 +554,7 @@
- +
@@ -750,9 +750,9 @@
@@ -800,7 +800,7 @@
- +
diff --git a/new_project/custom_addons/encoach_signup/controllers/auth.py b/new_project/custom_addons/encoach_signup/controllers/auth.py index ca6c5a25d..917cf0a49 100644 --- a/new_project/custom_addons/encoach_signup/controllers/auth.py +++ b/new_project/custom_addons/encoach_signup/controllers/auth.py @@ -21,7 +21,7 @@ class EncoachSignupController(http.Controller): # ------------------------------------------------------------------ # POST /api/auth/register # ------------------------------------------------------------------ - @http.route('/api/auth/register', type='http', auth='none', + @http.route('/api/auth/register', type='http', auth='public', methods=['POST'], csrf=False) def register(self, **kw): try: @@ -29,11 +29,24 @@ class EncoachSignupController(http.Controller): email = (body.get('email') or '').strip().lower() password = body.get('password') name = body.get('name', '').strip() + role = body.get('role', 'student') captcha_token = body.get('captcha_token') if not email or not password or not name: return _error_response('email, password, and name are required', 400) + valid_roles = ('academic_student', 'self_learner', 'teacher', 'student') + if role not in valid_roles: + return _error_response(f'role must be one of: {", ".join(valid_roles)}', 400) + + # Map frontend role names to user_type values + role_to_user_type = { + 'academic_student': 'student', + 'self_learner': 'student', + 'teacher': 'teacher', + 'student': 'student', + } + ICP = request.env['ir.config_parameter'].sudo() secret_key = ICP.get_param('encoach.captcha_secret_key', '') provider = ICP.get_param('encoach.captcha_provider', 'recaptcha') @@ -61,11 +74,17 @@ class EncoachSignupController(http.Controller): if existing: return _error_response('Email already registered', 409) - user = request.env['res.users'].sudo().create({ + company = request.env['res.company'].sudo().search([], limit=1) + user = request.env['res.users'].sudo().with_context( + no_reset_password=True, + ).create({ 'login': email, 'email': email, 'name': name, 'password': password, + 'company_id': company.id, + 'company_ids': [(4, company.id)], + 'user_type': role_to_user_type.get(role, 'student'), 'account_source': 'self_registered', 'account_status': 'unactivated', }) @@ -84,7 +103,9 @@ class EncoachSignupController(http.Controller): return _json_response({ 'message': 'Registration successful. Please verify your email.', + 'user_id': user.id, 'email': email, + 'role': role, }, 201) except Exception as e: @@ -253,6 +274,18 @@ class EncoachSignupController(http.Controller): return _error_response('learning_goal is required', 400) skip_placement = body.get('skip_placement', False) + placement_decision = 'skip' if skip_placement else 'take_now' + + # learning_style: accept as JSON array ["visual","audio"] or string + learning_style_raw = body.get('learning_style') + if isinstance(learning_style_raw, list): + valid_styles = {'visual', 'audio', 'reading', 'mixed'} + learning_style_raw = [s for s in learning_style_raw if s in valid_styles] + learning_style_json = json.dumps(learning_style_raw) if learning_style_raw else None + elif isinstance(learning_style_raw, str): + learning_style_json = json.dumps([learning_style_raw]) + else: + learning_style_json = None profile_vals = { 'user_id': user.id, @@ -261,8 +294,12 @@ class EncoachSignupController(http.Controller): 'hours_per_week': body.get('hours_per_week', 0), 'study_mode': body.get('study_mode'), 'exam_date': body.get('exam_date'), + 'placement_decision': placement_decision, } + if learning_style_json: + profile_vals['learning_style'] = learning_style_json + # Assign B1 default level when placement test is skipped if skip_placement: profile_vals['cefr_level'] = 'b1' @@ -282,7 +319,7 @@ class EncoachSignupController(http.Controller): return _json_response({ 'message': 'Onboarding complete', 'profile_id': profile.id, - 'skip_placement': skip_placement, + 'placement_decision': placement_decision, }) except Exception as e: diff --git a/new_project/custom_addons/encoach_signup/models/student_profile.py b/new_project/custom_addons/encoach_signup/models/student_profile.py index cb36a24d0..c2e18460a 100644 --- a/new_project/custom_addons/encoach_signup/models/student_profile.py +++ b/new_project/custom_addons/encoach_signup/models/student_profile.py @@ -1,4 +1,6 @@ -from odoo import models, fields +import json + +from odoo import models, fields, api class EncoachStudentProfile(models.Model): @@ -16,7 +18,7 @@ class EncoachStudentProfile(models.Model): ('c2', 'C2'), ]) target_band = fields.Float() - learning_style = fields.Text() + learning_style = fields.Text(help='JSON array of styles: visual, audio, reading, mixed') learning_goal = fields.Char(size=200) hours_per_week = fields.Integer() study_mode = fields.Selection([ @@ -25,4 +27,26 @@ class EncoachStudentProfile(models.Model): ]) exam_date = fields.Date() placement_completed = fields.Boolean(default=False) + placement_decision = fields.Selection([ + ('take_now', 'Take Now'), + ('skip', 'Skip'), + ]) entity_id = fields.Many2one('encoach.entity', ondelete='set null') + + def get_learning_styles(self): + """Return learning_style as a Python list.""" + self.ensure_one() + if not self.learning_style: + return [] + try: + return json.loads(self.learning_style) + except (json.JSONDecodeError, TypeError): + return [self.learning_style] if self.learning_style else [] + + def set_learning_styles(self, styles): + """Accept a list of styles and store as JSON.""" + self.ensure_one() + if isinstance(styles, list): + self.learning_style = json.dumps(styles) + elif isinstance(styles, str): + self.learning_style = json.dumps([styles])