fix: direct access report placeholder mismatches and missing recommendation option
- Fix cLegalAidNumber placeholder key mismatch (template expects cLegalAidNumber, code sent legalAidNumber) - Add fallback for flat legalAnalysis fields (AI may send them outside the nested object) - Improve assignedUserName resolution: prefer case assignee, filter out system/API user names - Add "המשך ייצוג" positive recommendation option to enum, checkboxes, prompt, and DOCX template Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
+33
-4
@@ -58,9 +58,28 @@ class DirectAccessReportGenerator
|
||||
? trim($contact->get('firstName') . ' ' . $contact->get('lastName'))
|
||||
: 'ללא איש קשר';
|
||||
|
||||
// Get assigned user name
|
||||
$assignedUser = $userId ? $this->entityManager->getEntityById('User', $userId) : null;
|
||||
$assignedUserName = $assignedUser ? $assignedUser->get('name') : ($this->user->get('name') ?? '');
|
||||
// Get assigned user name — prefer case's assignedUser, then userId, then current user
|
||||
$assignedUserName = '';
|
||||
$caseAssignedUserId = $case->get('assignedUserId');
|
||||
if ($caseAssignedUserId) {
|
||||
$caseAssignedUser = $this->entityManager->getEntityById('User', $caseAssignedUserId);
|
||||
if ($caseAssignedUser) {
|
||||
$assignedUserName = $caseAssignedUser->get('name') ?? '';
|
||||
}
|
||||
}
|
||||
if (empty($assignedUserName) && $userId) {
|
||||
$assignedUser = $this->entityManager->getEntityById('User', $userId);
|
||||
if ($assignedUser) {
|
||||
$assignedUserName = $assignedUser->get('name') ?? '';
|
||||
}
|
||||
}
|
||||
if (empty($assignedUserName)) {
|
||||
$assignedUserName = $this->user->get('name') ?? '';
|
||||
}
|
||||
// Filter out system/API user names
|
||||
if (in_array(strtolower($assignedUserName), ['api', 'x-api-key', 'system', 'admin'], true)) {
|
||||
$assignedUserName = '';
|
||||
}
|
||||
|
||||
// Build placeholder data directly from params
|
||||
$data = $this->buildPlaceholderData($params, $case, $contactName, $assignedUserName);
|
||||
@@ -133,9 +152,18 @@ class DirectAccessReportGenerator
|
||||
$legalAnalysis = json_decode($legalAnalysis, true) ?? [];
|
||||
}
|
||||
|
||||
// Fallback: if AI sent legalAnalysis fields flat (not nested), pick them up
|
||||
$laFields = ['q1DocsDetail', 'q2ReasonDetail', 'q4PanelComposition', 'q6ComplaintsDetail',
|
||||
'q8ClinicalGap', 'q9MoharaDetail', 'q10RehabDetail', 'q11ScoreDetail', 'q12UniqueDetail'];
|
||||
foreach ($laFields as $f) {
|
||||
if (empty($legalAnalysis[$f]) && !empty($params[$f])) {
|
||||
$legalAnalysis[$f] = $params[$f];
|
||||
}
|
||||
}
|
||||
|
||||
return [
|
||||
// Header
|
||||
'legalAidNumber' => $params['legalAidNumber'] ?? $case->get('cLegalAidNumber') ?? '',
|
||||
'cLegalAidNumber' => $params['legalAidNumber'] ?? $case->get('cLegalAidNumber') ?? '',
|
||||
'contactName' => $contactName,
|
||||
'assignedUserName' => $assignedUserName,
|
||||
'reportDate' => $this->formatDate(date('Y-m-d')),
|
||||
@@ -211,6 +239,7 @@ class DirectAccessReportGenerator
|
||||
$data['chk_contact_bad'] = ($contactStatus === 'לא תקין') ? $CHK : $UNCHK;
|
||||
|
||||
$rec = $params['recommendationType'] ?? '';
|
||||
$data['chk_rec_proceed'] = ($rec === 'המשך ייצוג') ? $CHK : $UNCHK;
|
||||
$data['chk_rec_consulting'] = ($rec === 'ייעוץ והדרכה חלף ייצוג') ? $CHK : $UNCHK;
|
||||
$data['chk_rec_waiver'] = ($rec === 'ויתור הלקוח') ? $CHK : $UNCHK;
|
||||
$data['chk_rec_replacement'] = ($rec === 'החלפת ייצוג') ? $CHK : $UNCHK;
|
||||
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "LegalAssistance",
|
||||
"version": "2.0.2",
|
||||
"version": "2.0.3",
|
||||
"acceptableVersions": [">=8.0.0"],
|
||||
"php": [">=8.1"],
|
||||
"releaseDate": "2026-04-09",
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -109,8 +109,8 @@
|
||||
},
|
||||
"recommendationType": {
|
||||
"type": "string",
|
||||
"enum": ["ייעוץ והדרכה חלף ייצוג", "ויתור הלקוח", "החלפת ייצוג", "לא נוצר קשר", "לא התקיימה פגישה", "עדיין לא ניתן להחליט", "נדרשים מסמכים נוספים", "המלצה לסירוב"],
|
||||
"description": "סוג ההמלצה/ההודעה"
|
||||
"enum": ["המשך ייצוג", "ייעוץ והדרכה חלף ייצוג", "ויתור הלקוח", "החלפת ייצוג", "לא נוצר קשר", "לא התקיימה פגישה", "עדיין לא ניתן להחליט", "נדרשים מסמכים נוספים", "המלצה לסירוב"],
|
||||
"description": "סוג ההמלצה/ההודעה — בחר ׳המשך ייצוג׳ כשמומלץ להגיש ערעור או להמשיך בייצוג"
|
||||
},
|
||||
"recommendationDetail": {
|
||||
"type": "string",
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user