feat: institutional + support + training admin sections (backend + frontend)
Ship three fully-wired admin areas end-to-end with APIs, seeds, tests and docs. Backend (new `encoach_lms_api` addon + existing addons): - Institutional: academic years/terms, departments, admission registers & admissions, courses/batches, lessons, fees (terms + student fees + invoicing with income-account auto-wiring), gradebook (assignments/grades), library, facilities (encoach.asset), student leave, result templates + marksheets (incl. delete-with-cascade). - Support: `encoach.ticket` model + CRUD/assignee routes; payment records derived from `op.student.fees.details` and `account.move`; platform settings backed by `encoach.code` and `ir.config_parameter` (packages + grading config). - Training: `encoach.vocab.item` + `encoach.grammar.rule` (plus progress models) with CRUD, pagination, search/level filters, and upsert-style progress endpoints. Odoo 19 compatibility: `_sql_constraints` replaced with `@api.constrains`; `ValidationError`/`UserError` mapped to HTTP 400. Frontend: - Rewire institutional admin pages (Academic Year Manager, Admissions, Courses, Lessons, Fees, Gradebook, Library, Facilities, Student Leave, Marksheets, Taxonomy, Resources) to real APIs with React Query invalidation and dialogs. - New typed services: `payments.service.ts`, `platformSettings.service.ts`, `training.service.ts`. Updated `fees/gradebook/lms/courseware/taxonomy/ resources/student-progress/generation` services + related types. - Rewrite `VocabularyPage`, `GrammarPage`, `PaymentRecordPage`, `SettingsPage`, `TicketsPage` to consume live data with search/filter/progress/CRUD flows. - New shared components: `TaxonomyCascade`, `MaterialViewer`, `teacher/TeacherLibrary`. - Favicons/branding assets and misc. UX polish across teacher/student pages. Tooling & QA: - Seeders: `seed_demo.py`, `seed_demo_data.py`, `seed_institutional.py` (idempotent, covers institutional + support + training fixtures incl. income-account wiring). - API write-flow test suites: `test_write_flows.py` (institutional), `test_support_flows.py` (support), `test_training_flows.py` (training), `test_ai_full.py`. All suites pass end-to-end. - Docs: add `docs/PROJECT_SUMMARY.md` with per-section scope, artifacts and QA. - `.gitignore`: ignore `pgdata_bak_*/`, `frontend/.vite/`, `frontend/dist/`, `frontend/node_modules/`. Made-with: Cursor
This commit is contained in:
@@ -15,6 +15,14 @@ def _cr():
|
||||
return request.env.cr
|
||||
|
||||
|
||||
def _table_exists(cr, name):
|
||||
cr.execute(
|
||||
"SELECT to_regclass(%s) IS NOT NULL", (f"public.{name}",)
|
||||
)
|
||||
row = cr.fetchone()
|
||||
return bool(row and row[0])
|
||||
|
||||
|
||||
def _user_name(cr, user_id):
|
||||
if not user_id:
|
||||
return ''
|
||||
@@ -34,6 +42,8 @@ class ApprovalWorkflowController(http.Controller):
|
||||
def list_workflows(self, **kw):
|
||||
try:
|
||||
cr = _cr()
|
||||
if not _table_exists(cr, 'encoach_approval_workflow'):
|
||||
return _json_response({'items': [], 'total': 0})
|
||||
cr.execute(
|
||||
"SELECT id, name, type, allow_bypass, entity_id, create_date "
|
||||
"FROM encoach_approval_workflow ORDER BY create_date DESC")
|
||||
@@ -145,6 +155,8 @@ class ApprovalWorkflowController(http.Controller):
|
||||
def list_requests(self, **kw):
|
||||
try:
|
||||
cr = _cr()
|
||||
if not _table_exists(cr, 'encoach_approval_request'):
|
||||
return _json_response({'items': [], 'total': 0})
|
||||
state_filter = kw.get('state')
|
||||
where = ""
|
||||
params = []
|
||||
|
||||
@@ -1,34 +1,175 @@
|
||||
import json
|
||||
import logging
|
||||
|
||||
from odoo import http
|
||||
from odoo.http import request
|
||||
from odoo.addons.encoach_api.controllers.base import (
|
||||
jwt_required, _json_response, _error_response,
|
||||
jwt_required, _json_response, _error_response, _get_json_body,
|
||||
)
|
||||
|
||||
_logger = logging.getLogger(__name__)
|
||||
|
||||
ENTITY_MODEL = 'encoach.entity'
|
||||
|
||||
|
||||
def _entity_to_dict(entity):
|
||||
d = entity.to_api_dict() if hasattr(entity, 'to_api_dict') else {
|
||||
'id': entity.id,
|
||||
'name': entity.name,
|
||||
'code': getattr(entity, 'code', '') or '',
|
||||
'type': getattr(entity, 'type', '') or '',
|
||||
'active': entity.active if hasattr(entity, 'active') else True,
|
||||
'user_count': getattr(entity, 'user_count', 0) or 0,
|
||||
}
|
||||
d['role_count'] = len(entity.role_ids) if hasattr(entity, 'role_ids') else 0
|
||||
return d
|
||||
|
||||
|
||||
def _role_to_dict(role):
|
||||
return {
|
||||
'id': role.id,
|
||||
'name': role.name,
|
||||
'code': getattr(role, 'code', '') or '',
|
||||
'entity_id': role.entity_id.id if hasattr(role, 'entity_id') and role.entity_id else None,
|
||||
'permission_ids': role.permission_ids.ids if hasattr(role, 'permission_ids') else [],
|
||||
'user_count': len(role.user_ids) if hasattr(role, 'user_ids') else 0,
|
||||
}
|
||||
|
||||
|
||||
class EntityController(http.Controller):
|
||||
|
||||
@http.route('/api/entities', type='http', auth='none',
|
||||
@http.route('/api/entities', type='http', auth='public',
|
||||
methods=['GET'], csrf=False)
|
||||
@jwt_required
|
||||
def list_entities(self, **kw):
|
||||
try:
|
||||
cr = request.env.cr
|
||||
cr.execute(
|
||||
"SELECT id, name, code, type FROM encoach_entity ORDER BY name")
|
||||
items = []
|
||||
for eid, name, code, etype in cr.fetchall():
|
||||
items.append({
|
||||
'id': eid,
|
||||
'name': name,
|
||||
'code': code or '',
|
||||
'type': etype or '',
|
||||
})
|
||||
return _json_response({'items': items, 'total': len(items)})
|
||||
M = request.env[ENTITY_MODEL].sudo()
|
||||
domain = []
|
||||
if kw.get('search'):
|
||||
domain.append(('name', 'ilike', kw['search']))
|
||||
if kw.get('type'):
|
||||
domain.append(('type', '=', kw['type']))
|
||||
recs = M.search(domain, order='name')
|
||||
items = [_entity_to_dict(r) for r in recs]
|
||||
return _json_response({
|
||||
'data': items,
|
||||
'items': items,
|
||||
'total': len(items),
|
||||
})
|
||||
except Exception as e:
|
||||
_logger.exception('list entities failed')
|
||||
return _json_response({'error': str(e)}, 500)
|
||||
return _error_response(str(e), 500)
|
||||
|
||||
@http.route('/api/entities/<int:entity_id>', type='http', auth='public',
|
||||
methods=['GET'], csrf=False)
|
||||
@jwt_required
|
||||
def get_entity(self, entity_id, **kw):
|
||||
try:
|
||||
entity = request.env[ENTITY_MODEL].sudo().browse(entity_id)
|
||||
if not entity.exists():
|
||||
return _error_response('Entity not found', 404)
|
||||
return _json_response({'data': _entity_to_dict(entity)})
|
||||
except Exception as e:
|
||||
return _error_response(str(e), 500)
|
||||
|
||||
@http.route('/api/entities', type='http', auth='public',
|
||||
methods=['POST'], csrf=False)
|
||||
@jwt_required
|
||||
def create_entity(self, **kw):
|
||||
body = _get_json_body()
|
||||
name = body.get('name', '').strip()
|
||||
if not name:
|
||||
return _error_response('Name is required', 400)
|
||||
|
||||
code = body.get('code', '').strip()
|
||||
if not code:
|
||||
code = name.upper().replace(' ', '_')[:20]
|
||||
|
||||
vals = {'name': name, 'code': code}
|
||||
for field in ('type', 'primary_color', 'secondary_color',
|
||||
'background_color', 'login_title',
|
||||
'login_description', 'results_release_mode'):
|
||||
if field in body:
|
||||
vals[field] = body[field]
|
||||
|
||||
try:
|
||||
entity = request.env[ENTITY_MODEL].sudo().create(vals)
|
||||
return _json_response({'data': _entity_to_dict(entity)}, 201)
|
||||
except Exception as e:
|
||||
_logger.exception('Error creating entity')
|
||||
msg = str(e)
|
||||
if 'unique' in msg.lower() or 'duplicate' in msg.lower():
|
||||
return _error_response(
|
||||
f'An entity with code "{code}" already exists', 409)
|
||||
return _error_response(msg, 500)
|
||||
|
||||
@http.route('/api/entities/<int:entity_id>', type='http', auth='public',
|
||||
methods=['PATCH', 'PUT'], csrf=False)
|
||||
@jwt_required
|
||||
def update_entity(self, entity_id, **kw):
|
||||
body = _get_json_body()
|
||||
try:
|
||||
entity = request.env[ENTITY_MODEL].sudo().browse(entity_id)
|
||||
if not entity.exists():
|
||||
return _error_response('Entity not found', 404)
|
||||
|
||||
vals = {}
|
||||
for field in ('name', 'code', 'type', 'primary_color',
|
||||
'secondary_color', 'background_color',
|
||||
'login_title', 'login_description',
|
||||
'results_release_mode', 'active'):
|
||||
if field in body:
|
||||
vals[field] = body[field]
|
||||
if vals:
|
||||
entity.write(vals)
|
||||
return _json_response({'data': _entity_to_dict(entity)})
|
||||
except Exception as e:
|
||||
return _error_response(str(e), 500)
|
||||
|
||||
@http.route('/api/entities/<int:entity_id>', type='http', auth='public',
|
||||
methods=['DELETE'], csrf=False)
|
||||
@jwt_required
|
||||
def delete_entity(self, entity_id, **kw):
|
||||
try:
|
||||
entity = request.env[ENTITY_MODEL].sudo().browse(entity_id)
|
||||
if not entity.exists():
|
||||
return _error_response('Entity not found', 404)
|
||||
entity.sudo().unlink()
|
||||
return _json_response({'success': True})
|
||||
except Exception as e:
|
||||
msg = str(e)
|
||||
if 'foreign key' in msg.lower() or 'restrict' in msg.lower():
|
||||
return _error_response(
|
||||
'Cannot delete: entity has linked users or roles', 409)
|
||||
return _error_response(msg, 500)
|
||||
|
||||
@http.route('/api/entities/<int:entity_id>/roles', type='http',
|
||||
auth='public', methods=['GET'], csrf=False)
|
||||
@jwt_required
|
||||
def list_entity_roles(self, entity_id, **kw):
|
||||
try:
|
||||
roles = request.env['encoach.role'].sudo().search([
|
||||
('entity_id', '=', entity_id)
|
||||
])
|
||||
return _json_response({
|
||||
'data': [_role_to_dict(r) for r in roles],
|
||||
'total': len(roles),
|
||||
})
|
||||
except Exception as e:
|
||||
return _error_response(str(e), 500)
|
||||
|
||||
@http.route('/api/entities/<int:entity_id>/roles', type='http',
|
||||
auth='public', methods=['POST'], csrf=False)
|
||||
@jwt_required
|
||||
def create_entity_role(self, entity_id, **kw):
|
||||
body = _get_json_body()
|
||||
name = body.get('name', '').strip()
|
||||
if not name:
|
||||
return _error_response('Role name is required', 400)
|
||||
vals = {'name': name, 'entity_id': entity_id}
|
||||
if body.get('permission_ids'):
|
||||
vals['permission_ids'] = [(6, 0, [int(p) for p in body['permission_ids']])]
|
||||
try:
|
||||
role = request.env['encoach.role'].sudo().create(vals)
|
||||
return _json_response({'data': _role_to_dict(role)}, 201)
|
||||
except Exception as e:
|
||||
return _error_response(str(e), 500)
|
||||
|
||||
Reference in New Issue
Block a user