diff --git a/bemade_sports_clinic/__manifest__.py b/bemade_sports_clinic/__manifest__.py index c999944..77069ab 100644 --- a/bemade_sports_clinic/__manifest__.py +++ b/bemade_sports_clinic/__manifest__.py @@ -88,6 +88,7 @@ This module provides a complete sports medicine clinic management solution with "views/portal_attachments_template.xml", "views/portal_event_detail_template.xml", "views/portal_event_edit_template.xml", + "views/portal_event_create_template.xml", "views/treatment_note_views.xml", "views/res_partner_views.xml", "views/res_users_views.xml", diff --git a/bemade_sports_clinic/controllers/events_portal.py b/bemade_sports_clinic/controllers/events_portal.py index 2921acc..f81b3e7 100644 --- a/bemade_sports_clinic/controllers/events_portal.py +++ b/bemade_sports_clinic/controllers/events_portal.py @@ -447,3 +447,170 @@ class EventsPortal(CustomerPortal, AccessControlMixin): # Clean error message to prevent redirect issues with newlines error_msg = str(e).replace('\n', ' ').replace('\r', ' ') return http.request.redirect(f'/my/event/{event_id}/edit?error={error_msg}') + + @http.route(['/my/event/create'], type='http', auth='user', website=True) + def create_event_form(self, **kw): + """Display event creation form - only accessible to therapists""" + # Access: only therapists (or system) can create + user = http.request.env.user + is_therapist = user.has_group('bemade_sports_clinic.group_portal_treatment_professional') or \ + user.has_group('bemade_sports_clinic.group_sports_clinic_treatment_professional') + if not (is_therapist or user.has_group('base.group_system')): + raise AccessError(_("You don't have permission to create events.")) + + # Options for form + teams = self._get_accessible_teams() if not user.has_group('base.group_system') else http.request.env['sports.team'].search([]) + treatment_professionals = self._get_treatment_professionals() + venues = http.request.env['res.partner'].search([('is_venue', '=', True)]) + + values = { + 'teams': teams, + 'treatment_professionals': treatment_professionals, + 'venues': venues, + 'page_name': 'event_create', + } + return http.request.render('bemade_sports_clinic.portal_event_create', values) + + @http.route(['/my/event/create/submit'], type='http', auth='user', website=True, methods=['POST'], csrf=False) + def create_event_submit(self, **post): + """Handle event creation - only accessible to therapists""" + # Access: only therapists (or system) can create + user = http.request.env.user + is_therapist = user.has_group('bemade_sports_clinic.group_portal_treatment_professional') or \ + user.has_group('bemade_sports_clinic.group_sports_clinic_treatment_professional') + if not (is_therapist or user.has_group('base.group_system')): + raise AccessError(_("You don't have permission to create events.")) + + try: + create_vals = {} + + # Required fields + if 'name' in post and post['name']: + create_vals['name'] = post['name'] + else: + raise UserError(_('Event name is required.')) + + if 'team_id' in post and post['team_id']: + create_vals['team_id'] = int(post['team_id']) + else: + raise UserError(_('Team is required.')) + + # Optional simple fields + if 'description' in post: + create_vals['description'] = post['description'] + if 'venue_id' in post and post['venue_id']: + create_vals['venue_id'] = int(post['venue_id']) + if 'event_type' in post: + create_vals['event_type'] = post['event_type'] + if 'state' in post: + create_vals['state'] = post['state'] + + # Datetime fields + def _parse_dt(val): + if not val: + return False + try: + if 'T' in val: + return datetime.strptime(val, '%Y-%m-%dT%H:%M') + return datetime.strptime(val, '%Y-%m-%d %H:%M') + except ValueError: + try: + if 'T' in val: + return datetime.strptime(val, '%Y-%m-%dT%H:%M:%S') + return datetime.strptime(val, '%Y-%m-%d %H:%M:%S') + except ValueError: + return val + + if 'date_start' in post and post['date_start']: + create_vals['date_start'] = _parse_dt(post['date_start']) + else: + raise UserError(_('Event start time is required.')) + + if 'date_end' in post and post['date_end']: + create_vals['date_end'] = _parse_dt(post['date_end']) + else: + raise UserError(_('Event end time is required.')) + + if 'therapist_start' in post and post['therapist_start']: + create_vals['therapist_start'] = _parse_dt(post['therapist_start']) + if 'therapist_end' in post and post['therapist_end']: + create_vals['therapist_end'] = _parse_dt(post['therapist_end']) + + # Assigned staff (same handling as save_event) + staff_param = None + if 'assigned_staff_ids' in post: + staff_param = post['assigned_staff_ids'] + elif 'assigned_staff_ids[]' in post: + staff_param = post['assigned_staff_ids[]'] + + staff_ids = [] + if staff_param is not None: + _logger.info(f"Raw assigned_staff_ids from form: {staff_param} (type: {type(staff_param)})") + if isinstance(staff_param, list): + staff_ids = [int(x) for x in staff_param if x] + elif staff_param: + if ',' in str(staff_param): + staff_ids = [int(x.strip()) for x in str(staff_param).split(',') if x.strip()] + else: + staff_ids = [int(staff_param)] + create_vals['assigned_staff_ids'] = [(6, 0, staff_ids)] + + # Task creation is handled by the model's create() default logic + + event = http.request.env['sports.event'].create(create_vals) + + # Surgical sudo: create management task as superuser to bypass project/analytic ACLs + try: + event.sudo().create_management_task() + except Exception as task_err: + _logger.warning(f"Portal task creation failed for event {event.id}: {task_err}") + + return http.request.redirect(f'/my/event/{event.id}?created=1') + + except Exception as e: + error_msg = str(e).replace('\n', ' ').replace('\r', ' ') + return http.request.redirect(f"/my/event/create?error={error_msg}") + + @http.route(['/my/venue/create'], type='json', auth='user', website=True, methods=['POST'], csrf=False) + def create_venue_ajax(self, **post): + """Create a venue partner record via AJAX for portal users. + Uses surgical sudo to avoid ACL/record rule issues, but restricts fields strictly. + """ + user = http.request.env.user + is_therapist = user.has_group('bemade_sports_clinic.group_portal_treatment_professional') or \ + user.has_group('bemade_sports_clinic.group_sports_clinic_treatment_professional') + if not (is_therapist or user.has_group('base.group_system')): + return {'success': False, 'error': _("You don't have permission to create venues.")} + + name = (post.get('name') or '').strip() + if not name: + return {'success': False, 'error': _('Venue name is required.')} + + try: + vals = { + 'name': name, + 'is_company': True, + 'is_venue': True, + 'type': 'other', + } + # Optional address fields + for key in ['street', 'street2', 'city', 'zip']: + if post.get(key): + vals[key] = post.get(key) + + # Optional country/state by id + if post.get('country_id'): + try: + vals['country_id'] = int(post.get('country_id')) + except Exception: + pass + if post.get('state_id'): + try: + vals['state_id'] = int(post.get('state_id')) + except Exception: + pass + + venue = http.request.env['res.partner'].sudo().create(vals) + return {'success': True, 'id': venue.id, 'name': venue.name} + except Exception as e: + return {'success': False, 'error': str(e)} diff --git a/bemade_sports_clinic/models/sports_event.py b/bemade_sports_clinic/models/sports_event.py index 1bb573f..822edfd 100644 --- a/bemade_sports_clinic/models/sports_event.py +++ b/bemade_sports_clinic/models/sports_event.py @@ -37,6 +37,7 @@ class SportsEvent(models.Model): tracking=True, index=True, groups=_portal_groups, + default=fields.Datetime.now, help='When the event starts' ) @@ -90,7 +91,7 @@ class SportsEvent(models.Model): ('in_progress', 'In Progress'), ('completed', 'Completed'), ('cancelled', 'Cancelled') - ], string='Status', default='draft', tracking=True, groups=_portal_groups) + ], string='Status', default='confirmed', tracking=True, groups=_portal_groups) # ======================================== # RELATIONSHIPS (Portal Accessible) @@ -245,18 +246,27 @@ class SportsEvent(models.Model): # ONCHANGE METHODS # ======================================== - @api.onchange('date_start', 'date_end') - def _onchange_event_dates(self): - """Set default therapist times when event dates change""" - if self.date_start and self.date_end: - # Only set therapist times if they are currently blank - if not self.therapist_start: - # Set therapist start to 30 minutes before event start - from datetime import timedelta - self.therapist_start = self.date_start - timedelta(minutes=30) - - if not self.therapist_end: - # Set therapist end to event end time + @api.onchange('date_start') + def _onchange_date_start(self): + """When event start changes: + - therapist_start = 30 minutes prior + - date_end = 2 hours after + - therapist_end = date_end + """ + if self.date_start: + from datetime import timedelta + self.therapist_start = self.date_start - timedelta(minutes=30) + self.date_end = self.date_start + timedelta(hours=2) + self.therapist_end = self.date_end + + @api.onchange('date_end') + def _onchange_date_end(self): + """When event end changes: + - therapist_end = max(therapist_end, date_end) + """ + if self.date_end: + # If therapist_end not set or earlier than date_end, align to date_end + if not self.therapist_end or self.therapist_end < self.date_end: self.therapist_end = self.date_end # ======================================== @@ -365,9 +375,13 @@ class SportsEvent(models.Model): events = super().create(vals_list) # Auto-create management tasks for events that need them - for event, vals in zip(events, vals_list): - if vals.get('auto_create_task', True): - event.create_management_task() + # IMPORTANT: Only internal users (base.group_user) may auto-create tasks here. + # Portal users will have tasks created via a controller-side sudo() after access checks. + is_internal = self.env.user.has_group('base.group_user') + if is_internal: + for event, vals in zip(events, vals_list): + if vals.get('auto_create_task', True): + event.create_management_task() return events diff --git a/bemade_sports_clinic/views/events_portal_templates.xml b/bemade_sports_clinic/views/events_portal_templates.xml index 6e2cef2..7f1c39e 100644 --- a/bemade_sports_clinic/views/events_portal_templates.xml +++ b/bemade_sports_clinic/views/events_portal_templates.xml @@ -25,7 +25,7 @@
-
+
- + Clear Filters + + + Add Event + +
diff --git a/bemade_sports_clinic/views/portal_event_create_template.xml b/bemade_sports_clinic/views/portal_event_create_template.xml new file mode 100644 index 0000000..81e70f1 --- /dev/null +++ b/bemade_sports_clinic/views/portal_event_create_template.xml @@ -0,0 +1,495 @@ + + + + + + + diff --git a/bemade_sports_clinic/views/portal_event_edit_template.xml b/bemade_sports_clinic/views/portal_event_edit_template.xml index 7e53653..910f005 100644 --- a/bemade_sports_clinic/views/portal_event_edit_template.xml +++ b/bemade_sports_clinic/views/portal_event_edit_template.xml @@ -124,14 +124,19 @@
- +
+ + +
@@ -266,6 +271,47 @@ + + + + + +