From 708233f9b4830be19cecfa2d6a438d5e9f1808eb Mon Sep 17 00:00:00 2001 From: Flatlogic Bot Date: Mon, 2 Mar 2026 19:32:17 +0000 Subject: [PATCH] =?UTF-8?q?Podzia=C5=82=20na=20typy=20proces=C3=B3w?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- WorkflowEngine.php | 101 +++++++++++++- _get_instance_details.php | 11 +- _init_single_instance.php | 54 +++----- _save_process_definition.php | 11 +- _sidebar.php | 18 +++ assets/js/process_definitions.js | 2 + cookie.txt | 2 +- .../038_add_subject_scope_and_run_number.php | 42 ++++++ groups_processes.php | 114 ++++++++++++++++ meetings_processes.php | 127 ++++++++++++++++++ organization_processes.php | 106 +++++++++++++++ patch_form.py | 23 ++++ patch_js.py | 22 +++ patch_modal.py | 89 +++++------- patch_save_def.php | 43 ++++++ patch_save_def.py | 39 ++++++ patch_sidebar.php | 31 +++++ patch_we.php | 121 +++++++++++++++++ patch_we.py | 109 +++++++++++++++ process_definitions.php | 11 +- 20 files changed, 975 insertions(+), 101 deletions(-) create mode 100644 db/migrations/038_add_subject_scope_and_run_number.php create mode 100644 groups_processes.php create mode 100644 meetings_processes.php create mode 100644 organization_processes.php create mode 100644 patch_form.py create mode 100644 patch_js.py create mode 100644 patch_save_def.php create mode 100644 patch_save_def.py create mode 100644 patch_sidebar.php create mode 100644 patch_we.php create mode 100644 patch_we.py diff --git a/WorkflowEngine.php b/WorkflowEngine.php index 9fd2c8f..100149c 100644 --- a/WorkflowEngine.php +++ b/WorkflowEngine.php @@ -57,7 +57,7 @@ class WorkflowEngine { $people = $stmt_people->fetchAll(PDO::FETCH_ASSOC); // 4. Fetch all process definitions with their JSON - $stmt_defs = $this->pdo->prepare("SELECT id, code, name, definition_json, is_active FROM process_definitions WHERE is_active = 1 AND is_latest = 1 ORDER BY sort_order, name"); + $stmt_defs = $this->pdo->prepare("SELECT id, code, name, definition_json, is_active FROM process_definitions WHERE is_active = 1 AND is_latest = 1 AND subject_scope = 'person' ORDER BY sort_order, name"); $stmt_defs->execute(); $process_definitions_raw = $stmt_defs->fetchAll(PDO::FETCH_ASSOC); @@ -1155,4 +1155,103 @@ $spotkania_cols = []; return $stmt->fetchAll(PDO::FETCH_ASSOC); } + + public function getOrCreateInstanceBySubject(string $subjectType, int $subjectId, string $processCode, int $userId, string $mode='resume_or_create'): array { + if (!in_array($subjectType, ['person', 'meeting', 'bni_group', 'organization'])) { + throw new \InvalidArgumentException("Invalid subjectType."); + } + if ($subjectId <= 0) { + throw new \InvalidArgumentException("subjectId must be > 0."); + } + if (empty($processCode)) { + throw new \InvalidArgumentException("processCode cannot be empty."); + } + + $inTransaction = $this->pdo->inTransaction(); + if (!$inTransaction) { $this->pdo->beginTransaction(); } + + try { + $sql = "SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 AND subject_scope = ? ORDER BY version DESC, id DESC LIMIT 1"; + $stmt = $this->pdo->prepare($sql); + $stmt->execute([$processCode, $subjectType]); + $definition = $stmt->fetch(\PDO::FETCH_ASSOC); + + if (!$definition) { + $stmt = $this->pdo->prepare("SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 ORDER BY version DESC, id DESC LIMIT 1"); + $stmt->execute([$processCode]); + $definition = $stmt->fetch(\PDO::FETCH_ASSOC); + if (!$definition) { + throw new WorkflowNotFoundException("No active process definition found for code '$processCode'"); + } + } + + $defId = $definition['id']; + $defJson = json_decode($definition['definition_json'], true); + $startNodeId = $defJson['start_node_id'] ?? null; + if (!$startNodeId) { + throw new \Exception("Process definition missing start_node_id"); + } + + $instance = null; + if ($mode === 'resume_or_create') { + $stmt = $this->pdo->prepare( + "SELECT pi.* FROM process_instances pi\n JOIN process_definitions pd ON pi.process_definition_id = pd.id\n WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?\n ORDER BY pi.id DESC LIMIT 1" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $instance = $stmt->fetch(\PDO::FETCH_ASSOC); + } + + if (!$instance) { + $stmt = $this->pdo->prepare( + "SELECT MAX(pi.run_number) + FROM process_instances pi + JOIN process_definitions pd ON pi.process_definition_id = pd.id + WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $maxRun = (int)$stmt->fetchColumn(); + $runNumber = $maxRun + 1; + + $personIdVal = ($subjectType === 'person') ? $subjectId : null; + $status = $defJson['nodes'][$startNodeId]['ui_hints']['status'] ?? 'in_progress'; + $reason = $defJson['nodes'][$startNodeId]['ui_hints']['reason'] ?? ''; + $nextStep = $defJson['nodes'][$startNodeId]['ui_hints']['next_step'] ?? ''; + + $stmt = $this->pdo->prepare( + "INSERT INTO process_instances + (subject_type, subject_id, person_id, process_definition_id, current_node_id, current_status, current_reason, suggested_next_step, run_number, last_activity_at, data_json) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), '{}')" + ); + $stmt->execute([ + $subjectType, $subjectId, $personIdVal, $defId, $startNodeId, $status, $reason, $nextStep, $runNumber + ]); + + $instanceId = $this->pdo->lastInsertId(); + $this->addEvent($instanceId, 'system', 'Process started.', $startNodeId, [], $userId); + + $stmt = $this->pdo->prepare("SELECT * FROM process_instances WHERE id = ?"); + $stmt->execute([$instanceId]); + $instance = $stmt->fetch(\PDO::FETCH_ASSOC); + } + + if (!$inTransaction) { $this->pdo->commit(); } + + return [ + 'instance_id' => $instance['id'], + 'process_definition_id' => $instance['process_definition_id'], + 'process_code' => $processCode, + 'subject_type' => $instance['subject_type'], + 'subject_id' => $instance['subject_id'], + 'person_id' => $instance['person_id'], + 'current_node_id' => $instance['current_node_id'], + 'current_status' => $instance['current_status'], + 'last_activity_at' => $instance['last_activity_at'], + 'data_json' => $instance['data_json'] + ]; + + } catch (\Exception $e) { + if (!$inTransaction) { $this->pdo->rollBack(); } + throw $e; + } + } } diff --git a/_get_instance_details.php b/_get_instance_details.php index f616002..4b315a8 100644 --- a/_get_instance_details.php +++ b/_get_instance_details.php @@ -53,6 +53,15 @@ if ($subject_type === 'person') { if ($meeting) { $subjectName = $meeting['group_name'] . ' - ' . date('d.m.Y', strtotime($meeting['meeting_datetime'])); } +} elseif ($subject_type === 'bni_group') { + $stmt_group = $pdo->prepare("SELECT name FROM bni_groups WHERE id = ?"); + $stmt_group->execute([$subject_id]); + $group = $stmt_group->fetch(); + if ($group) { + $subjectName = 'Grupa ' . $group['name']; + } +} elseif ($subject_type === 'organization') { + $subjectName = 'Główna Organizacja'; } $stmt_process = $pdo->prepare("SELECT * FROM process_definitions WHERE id = ?"); @@ -302,7 +311,7 @@ $instance = $engine->getActiveInstanceForSubject($process['code'], $subject_type

-

This process has not been started for this person.

+

This process has not been started for this subject.

diff --git a/_init_single_instance.php b/_init_single_instance.php index a11ea10..f6edc1a 100644 --- a/_init_single_instance.php +++ b/_init_single_instance.php @@ -19,51 +19,35 @@ if (!isset($_SESSION['user_id'])) { $userId = $_SESSION['user_id']; $personId = filter_input(INPUT_POST, 'person_id', FILTER_VALIDATE_INT); -$subjectType = filter_input(INPUT_POST, 'subject_type', FILTER_SANITIZE_STRING) ?: 'person'; -$subjectId = filter_input(INPUT_POST, 'subject_id', FILTER_VALIDATE_INT) ?: $personId; $processDefinitionId = filter_input(INPUT_POST, 'process_id', FILTER_VALIDATE_INT); + +$subjectType = filter_input(INPUT_POST, 'subject_type', FILTER_SANITIZE_STRING); +$subjectId = filter_input(INPUT_POST, 'subject_id', FILTER_VALIDATE_INT); $processCode = filter_input(INPUT_POST, 'process_code', FILTER_SANITIZE_STRING); -$deleteExisting = filter_input(INPUT_POST, 'delete_existing'); -$mode = filter_input(INPUT_POST, 'mode', FILTER_SANITIZE_STRING); +$mode = filter_input(INPUT_POST, 'mode', FILTER_SANITIZE_STRING) ?: 'resume_or_create'; + +if ($personId && !$subjectType) { + $subjectType = 'person'; + $subjectId = $personId; +} $pdo = db(); -if (!$processDefinitionId && $processCode) { - $stmt = $pdo->prepare("SELECT id FROM process_definitions WHERE code = ? AND is_latest = 1 LIMIT 1"); - $stmt->execute([$processCode]); - $processDefinitionId = $stmt->fetchColumn(); +if ($processDefinitionId && !$processCode) { + $stmt = $pdo->prepare("SELECT code FROM process_definitions WHERE id = ?"); + $stmt->execute([$processDefinitionId]); + $processCode = $stmt->fetchColumn(); } -if (!$subjectId || !$processDefinitionId) { - throw new InvalidArgumentException('Invalid or missing subject_id or process_id/process_code.'); +if (!$subjectId || !$subjectType || !$processCode) { + throw new InvalidArgumentException('Invalid or missing subject_type, subject_id, or process_code.'); } $engine = new WorkflowEngine(); +$instance = $engine->getOrCreateInstanceBySubject($subjectType, $subjectId, $processCode, $userId, $mode); - - $stmt_def = $pdo->prepare("SELECT code FROM process_definitions WHERE id = ?"); - $stmt_def->execute([$processDefinitionId]); - $code = $stmt_def->fetchColumn() ?: $processCode; - -if($deleteExisting === '1') { - $instance = $engine->getActiveInstanceForSubject($code, $subjectType, $subjectId, $cycleKey); - if ($instance) { - $engine->deleteInstance($instance['id']); - } -} - -if ($mode === 'create_new_run' || filter_input(INPUT_POST, 'force', FILTER_VALIDATE_INT) === 1) { - // start new process - $instanceId = $engine->startProcessForSubject($code, $subjectType, $subjectId, $userId, 'create_new_run', $cycleKey); - $stmt = $pdo->prepare("SELECT * FROM process_instances WHERE id = ?"); - $stmt->execute([$instanceId]); - $instance = $stmt->fetch(PDO::FETCH_ASSOC); -} else { - $instance = $engine->getOrCreateInstanceForSubject($processDefinitionId, $subjectType, $subjectId, $userId); -} - -if ($instance) { - echo json_encode(['success' => true, 'message' => 'Process initialized successfully.', 'instance_id' => $instance['id']]); +if ($instance && isset($instance['instance_id'])) { + echo json_encode(['success' => true, 'message' => 'Process initialized successfully.', 'instance_id' => $instance['instance_id']]); } else { throw new Exception("Failed to initialize process for an unknown reason."); -} +} \ No newline at end of file diff --git a/_save_process_definition.php b/_save_process_definition.php index b3ec95b..ce3aae2 100644 --- a/_save_process_definition.php +++ b/_save_process_definition.php @@ -93,6 +93,7 @@ try { $processId = $_POST['process_id'] ?? null; $name = $_POST['name'] ?? ''; $definition_json = $_POST['definition_json'] ?? ''; + $subject_scope = $_POST['subject_scope'] ?? 'person'; validate_definition_json($definition_json); @@ -108,14 +109,14 @@ try { if (empty($processId)) { // Create new process - $sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, is_latest) VALUES (?, ?, ?, ?, 1, 1, 1)'; - $params = [$name, $code, $definition_json, $start_node]; + $sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, is_latest, subject_scope) VALUES (?, ?, ?, ?, 1, 1, 1, ?)'; + $params = [$name, $code, $definition_json, $start_node, $subject_scope]; $message = 'Process created successfully.'; $stmt = $pdo->prepare($sql); $stmt->execute($params); } else { // "Update" existing process by creating a new version - $stmt_old = $pdo->prepare('SELECT code, version, sort_order, is_active FROM process_definitions WHERE id = ?'); + $stmt_old = $pdo->prepare('SELECT code, version, sort_order, is_active, subject_scope FROM process_definitions WHERE id = ?'); $stmt_old->execute([$processId]); $old = $stmt_old->fetch(); @@ -129,8 +130,8 @@ try { $stmt_update->execute([$db_code]); // Insert new version - $sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?)'; - $params = [$name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order']]; + $sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order, subject_scope) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, ?)'; + $params = [$name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order'], $subject_scope]; $stmt = $pdo->prepare($sql); $stmt->execute($params); $message = 'Process updated successfully (new version created).'; diff --git a/_sidebar.php b/_sidebar.php index 5a9364a..723f624 100644 --- a/_sidebar.php +++ b/_sidebar.php @@ -7,6 +7,24 @@ + +
  • + + + Procesy spotkań + +
    • +
  • + + + Procesy grup BNI + +
    • +
  • + + + Procesy organizacji +
  • diff --git a/assets/js/process_definitions.js b/assets/js/process_definitions.js index 56b0289..6259c9d 100644 --- a/assets/js/process_definitions.js +++ b/assets/js/process_definitions.js @@ -132,11 +132,13 @@ document.addEventListener('DOMContentLoaded', function () { if (isEdit) { const processId = button.dataset.processId; const processName = button.dataset.processName; + const subjectScope = button.dataset.subjectScope || 'person'; const processDefinition = button.dataset.processDefinition; modalTitle.textContent = 'Edit Process'; processIdInput.value = processId; processNameInput.value = processName; + if(document.getElementById('subjectScope')) document.getElementById('subjectScope').value = subjectScope; try { definition = JSON.parse(processDefinition || '{}'); diff --git a/cookie.txt b/cookie.txt index 7a0e70d..d8efdca 100644 --- a/cookie.txt +++ b/cookie.txt @@ -2,4 +2,4 @@ # https://curl.se/docs/http-cookies.html # This file was generated by libcurl! Edit at your own risk. -127.0.0.1 FALSE / FALSE 0 PHPSESSID np7q4kbboaogr1lb2gg3753mdu +localhost FALSE / FALSE 0 PHPSESSID nupuqse7tg6gsrulg298ru8sn8 diff --git a/db/migrations/038_add_subject_scope_and_run_number.php b/db/migrations/038_add_subject_scope_and_run_number.php new file mode 100644 index 0000000..d6dd85e --- /dev/null +++ b/db/migrations/038_add_subject_scope_and_run_number.php @@ -0,0 +1,42 @@ +query("SHOW COLUMNS FROM process_definitions LIKE 'subject_scope'"); + if (!$stmt->fetch()) { + $pdo->exec("ALTER TABLE process_definitions ADD COLUMN subject_scope VARCHAR(32) NOT NULL DEFAULT 'person' AFTER name"); + echo "Added subject_scope to process_definitions. +"; + } + + $stmt = $pdo->query("SHOW COLUMNS FROM process_instances LIKE 'run_number'"); + if (!$stmt->fetch()) { + $pdo->exec("ALTER TABLE process_instances ADD COLUMN run_number INT NOT NULL DEFAULT 1 AFTER subject_id"); + echo "Added run_number to process_instances. +"; + } + + $defJson = json_encode([ + 'start_node_id' => 'node_start', + 'nodes' => [ + ['id' => 'node_start', 'name' => 'Planowanie', 'type' => 'task', 'ui_hints' => ['color' => 'blue', 'status' => 'not_started']], + ['id' => 'node_end', 'name' => 'Zakończone', 'type' => 'end', 'ui_hints' => ['color' => 'green', 'status' => 'completed']] + ], + 'transitions' => [ + ['from' => 'node_start', 'to' => 'node_end', 'name' => 'Oznacz jako gotowe', 'trigger' => 'manual'] + ] + ]); + + $stmt = $pdo->prepare("SELECT id FROM process_definitions WHERE code = 'meeting_preparation_meeting'"); + $stmt->execute(); + if (!$stmt->fetch()) { + $stmtIns = $pdo->prepare("INSERT INTO process_definitions (code, name, version, is_active, subject_scope, definition_json) VALUES ('meeting_preparation_meeting', 'Przygotowanie spotkania (spotkanie)', 1, 1, 'meeting', :json)"); + $stmtIns->execute(['json' => $defJson]); + echo "Inserted meeting_preparation_meeting definition. +"; + } + + echo "Migration 038 completed. +"; +} diff --git a/groups_processes.php b/groups_processes.php new file mode 100644 index 0000000..23a918e --- /dev/null +++ b/groups_processes.php @@ -0,0 +1,114 @@ +prepare("SELECT * FROM bni_groups ORDER BY name"); +$stmt_groups->execute(); +$groups = $stmt_groups->fetchAll(\PDO::FETCH_ASSOC); + +$stmt_defs = $pdo->prepare("SELECT * FROM process_definitions WHERE is_active = 1 AND is_latest = 1 AND subject_scope = 'bni_group' ORDER BY sort_order, name"); +$stmt_defs->execute(); +$definitions = $stmt_defs->fetchAll(\PDO::FETCH_ASSOC); + +?> + + + +
    +
    + + +
    +
    +

    Procesy Grup BNI

    +
    + +
    + + + + + + + + + + + + + + + + + + getActiveInstanceForSubject($def['code'], 'bni_group', $group['id']); + $cellColor = ''; + $cellText = 'Brak'; + if ($instance) { + $cellText = $instance['current_status']; + if (in_array($instance['current_status'], ['completed','positive'])) { + $cellColor = 'background-color: #d1e7dd;'; + } else if ($instance['current_status'] == 'in_progress') { + $cellColor = 'background-color: #fff3cd;'; + } + } + ?> + + + + + +
    Grupa BNI
    Brak grup.
    + + + +
    +
    +
    +
    +
    + + + + diff --git a/meetings_processes.php b/meetings_processes.php new file mode 100644 index 0000000..414c8f2 --- /dev/null +++ b/meetings_processes.php @@ -0,0 +1,127 @@ +prepare(" + SELECT m.id as meeting_id, m.meeting_datetime, bg.name as group_name + FROM meetings m + JOIN bni_groups bg ON m.bni_group_id = bg.id + WHERE m.meeting_datetime >= :today + ORDER BY m.meeting_datetime ASC +"); +$stmt_meetings->execute(['today' => $today]); +$meetings = $stmt_meetings->fetchAll(\PDO::FETCH_ASSOC); + +// Fetch meeting process definitions +$stmt_defs = $pdo->prepare("SELECT * FROM process_definitions WHERE is_active = 1 AND is_latest = 1 AND subject_scope = 'meeting' ORDER BY sort_order, name"); +$stmt_defs->execute(); +$definitions = $stmt_defs->fetchAll(\PDO::FETCH_ASSOC); + +?> + + + +
    +
    + + +
    +
    +

    Procesy spotkań

    +
    + +
    + + + + + + + + + + + + + + + + + + getActiveInstanceForSubject($def['code'], 'meeting', $meeting['meeting_id']); + $cellColor = ''; + $cellText = 'Brak'; + if ($instance) { + // For simplicity just map status or display button + $cellText = $instance['current_status']; + if (in_array($instance['current_status'], ['completed','positive'])) { + $cellColor = 'background-color: #d1e7dd;'; + } else if ($instance['current_status'] == 'in_progress') { + $cellColor = 'background-color: #fff3cd;'; + } + } + ?> + + + + + +
    Spotkanie
    Brak przyszłych spotkań w bazie.
    +
    + +     		+ +
    +
    + +
    +
    +
    + + + + diff --git a/organization_processes.php b/organization_processes.php new file mode 100644 index 0000000..311f998 --- /dev/null +++ b/organization_processes.php @@ -0,0 +1,106 @@ +prepare("SELECT * FROM process_definitions WHERE is_active = 1 AND is_latest = 1 AND subject_scope = 'organization' ORDER BY sort_order, name"); +$stmt_defs->execute(); +$definitions = $stmt_defs->fetchAll(\PDO::FETCH_ASSOC); + +?> + + + +
    +
    + + +
    +
    +

    Procesy Organizacji

    +
    + +
    + + + + + + + + + + + + + + getActiveInstanceForSubject($def['code'], 'organization', 1); + $cellColor = ''; + $cellText = 'Brak'; + if ($instance) { + $cellText = $instance['current_status']; + if (in_array($instance['current_status'], ['completed','positive'])) { + $cellColor = 'background-color: #d1e7dd;'; + } else if ($instance['current_status'] == 'in_progress') { + $cellColor = 'background-color: #fff3cd;'; + } + } + ?> + + + + +
    Organizacja
    + Główna Organizacja + + +
    +
    +
    +
    +
    + + + + diff --git a/patch_form.py b/patch_form.py new file mode 100644 index 0000000..fa210f8 --- /dev/null +++ b/patch_form.py @@ -0,0 +1,23 @@ +import re +with open('process_definitions.php', 'r') as f: + content = f.read() + +new_field = """
    + + +
    +""" + +content = content.replace( + '
    \n ', + new_field + '
    \n ' +) + +with open('process_definitions.php', 'w') as f: + f.write(content) + diff --git a/patch_js.py b/patch_js.py new file mode 100644 index 0000000..5a56156 --- /dev/null +++ b/patch_js.py @@ -0,0 +1,22 @@ +import re +with open('assets/js/process_definitions.js', 'r') as f: + content = f.read() + +content = content.replace( + 'const processName = button.dataset.processName;', + 'const processName = button.dataset.processName;\n const subjectScope = button.dataset.subjectScope || \'person\';' +) + +content = content.replace( + 'processNameInput.value = processName;', + 'processNameInput.value = processName;\n if(document.getElementById(\'subjectScope\')) document.getElementById(\'subjectScope\').value = subjectScope;' +) + +content = content.replace( + 'processNameInput.value = \'";', + 'processNameInput.value = \'";\n if(document.getElementById(\'subjectScope\')) document.getElementById(\'subjectScope\').value = \'person\';' +) + +with open('assets/js/process_definitions.js', 'w') as f: + f.write(content) + diff --git a/patch_modal.py b/patch_modal.py index 1cbdd6c..a027e5c 100644 --- a/patch_modal.py +++ b/patch_modal.py @@ -1,63 +1,38 @@ -import re +import sys with open('_get_instance_details.php', 'r') as f: content = f.read() -old_block = " -
    - - - - - - - - -
    - " +patch = """} elseif ($subject_type === 'meeting') { + $stmt_meeting = $pdo->prepare("SELECT m.meeting_datetime, bg.name as group_name FROM meetings m JOIN bni_groups bg ON m.bni_group_id = bg.id WHERE m.id = ?"); + $stmt_meeting->execute([$subject_id]); + $meeting = $stmt_meeting->fetch(); + if ($meeting) { + $subjectName = $meeting['group_name'] . ' - ' . date('d.m.Y', strtotime($meeting['meeting_datetime'])); + } +} elseif ($subject_type === 'bni_group') { + $stmt_group = $pdo->prepare("SELECT name FROM bni_groups WHERE id = ?"); + $stmt_group->execute([$subject_id]); + $group = $stmt_group->fetch(); + if ($group) { + $subjectName = 'Grupa ' . $group['name']; + } +} elseif ($subject_type === 'organization') { + $subjectName = 'Główna Organizacja'; +}""" -new_block = " - -
    - - > - -
    - -
    - - - - - - - - - -
    - - " +old_code = """} elseif ($subject_type === 'meeting') { + $stmt_meeting = $pdo->prepare("SELECT m.meeting_datetime, bg.name as group_name FROM meetings m JOIN bni_groups bg ON m.bni_group_id = bg.id WHERE m.id = ?"); + $stmt_meeting->execute([$subject_id]); + $meeting = $stmt_meeting->fetch(); + if ($meeting) { + $subjectName = $meeting['group_name'] . ' - ' . date('d.m.Y', strtotime($meeting['meeting_datetime'])); + } +}""" -if old_block in content: - content = content.replace(old_block, new_block) - with open('_get_instance_details.php', 'w') as f: - f.write(content) - print("Patched successfully") -else: - print("Old block not found!") +content = content.replace(old_code, patch) + +with open('_get_instance_details.php', 'w') as f: + f.write(content) + +print("Patched modal") \ No newline at end of file diff --git a/patch_save_def.php b/patch_save_def.php new file mode 100644 index 0000000..9c71cfe --- /dev/null +++ b/patch_save_def.php @@ -0,0 +1,43 @@ +prepare('SELECT code, version, sort_order, is_active FROM process_definitions WHERE id = ?');", + "$stmt_old = $pdo->prepare('SELECT code, version, sort_order, is_active, subject_scope FROM process_definitions WHERE id = ?');", + $content +); + +$content = str_replace( + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?)';", + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order, subject_scope) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, ?)';", + $content +); + +$content = str_replace( + "$params = [ $name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order'] ];", + "$params = [ $name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order'], $subject_scope ];", + $content +); + +file_put_contents('_save_process_definition.php', $content); +echo "Patched _save_process_definition.php\n"; + diff --git a/patch_save_def.py b/patch_save_def.py new file mode 100644 index 0000000..9088083 --- /dev/null +++ b/patch_save_def.py @@ -0,0 +1,39 @@ +import sys + +with open('_save_process_definition.php', 'r') as f: + content = f.read() + +content = content.replace( + "$definition_json = $_POST['definition_json'] ?? '';", + "$definition_json = $_POST['definition_json'] ?? '';\n $subject_scope = $_POST['subject_scope'] ?? 'person';" +) + +content = content.replace( + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, is_latest) VALUES (?, ?, ?, ?, 1, 1, 1)';", + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, is_latest, subject_scope) VALUES (?, ?, ?, ?, 1, 1, 1, ?)';" +) + +content = content.replace( + "$params = [$name, $code, $definition_json, $start_node];", + "$params = [$name, $code, $definition_json, $start_node, $subject_scope];" +) + +content = content.replace( + "$stmt_old = $pdo->prepare('SELECT code, version, sort_order, is_active FROM process_definitions WHERE id = ?');", + "$stmt_old = $pdo->prepare('SELECT code, version, sort_order, is_active, subject_scope FROM process_definitions WHERE id = ?');" +) + +content = content.replace( + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?)';", + "$sql = 'INSERT INTO process_definitions (name, code, definition_json, start_node_id, is_active, version, supersedes_definition_id, is_latest, sort_order, subject_scope) VALUES (?, ?, ?, ?, ?, ?, ?, 1, ?, ?)';" +) + +content = content.replace( + "$params = [$name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order']];", + "$params = [$name, $db_code, $definition_json, $start_node, $is_active, $new_version, $processId, $old['sort_order'], $subject_scope];" +) + +with open('_save_process_definition.php', 'w') as f: + f.write(content) + +print("Patched") diff --git a/patch_sidebar.php b/patch_sidebar.php new file mode 100644 index 0000000..8f2a8b2 --- /dev/null +++ b/patch_sidebar.php @@ -0,0 +1,31 @@ + +     + + Procesy spotkań + +
    • +
  • + + + Procesy grup BNI + +
    • +
  • + + + Procesy organizacji + +
    • +HTML; + +$search = '
  • + '; + +$content = str_replace($search, $newLinks . "\n " . $search, $content); +file_put_contents('_sidebar.php', $content); +echo "Patched _sidebar.php\n"; + diff --git a/patch_we.php b/patch_we.php new file mode 100644 index 0000000..54713a6 --- /dev/null +++ b/patch_we.php @@ -0,0 +1,121 @@ + 0."); + } + if (empty($processCode)) { + throw new \InvalidArgumentException("processCode cannot be empty."); + } + + $inTransaction = $this->pdo->inTransaction(); + if (!$inTransaction) { $this->pdo->beginTransaction(); } + + try { + $sql = "SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 AND subject_scope = ? ORDER BY version DESC, id DESC LIMIT 1"; + $stmt = $this->pdo->prepare($sql); + $stmt->execute([$processCode, $subjectType]); + $definition = $stmt->fetch(\PDO::FETCH_ASSOC); + + if (!$definition) { + $stmt = $this->pdo->prepare("SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 ORDER BY version DESC, id DESC LIMIT 1"); + $stmt->execute([$processCode]); + $definition = $stmt->fetch(\PDO::FETCH_ASSOC); + if (!$definition) { + throw new WorkflowNotFoundException("No active process definition found for code '$processCode'"); + } + } + + $defId = $definition['id']; + $defJson = json_decode($definition['definition_json'], true); + $startNodeId = $defJson['start_node_id'] ?? null; + if (!$startNodeId) { + throw new \Exception("Process definition missing start_node_id"); + } + + $instance = null; + if ($mode === 'resume_or_create') { + $stmt = $this->pdo->prepare( + "SELECT pi.* FROM process_instances pi\n JOIN process_definitions pd ON pi.process_definition_id = pd.id\n WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?\n ORDER BY pi.id DESC LIMIT 1" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $instance = $stmt->fetch(\PDO::FETCH_ASSOC); + } + + if (!$instance) { + $stmt = $this->pdo->prepare( + "SELECT MAX(pi.run_number) + FROM process_instances pi + JOIN process_definitions pd ON pi.process_definition_id = pd.id + WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $maxRun = (int)$stmt->fetchColumn(); + $runNumber = $maxRun + 1; + + $personIdVal = ($subjectType === 'person') ? $subjectId : null; + $status = $defJson['nodes'][$startNodeId]['ui_hints']['status'] ?? 'in_progress'; + $reason = $defJson['nodes'][$startNodeId]['ui_hints']['reason'] ?? ''; + $nextStep = $defJson['nodes'][$startNodeId]['ui_hints']['next_step'] ?? ''; + + $stmt = $this->pdo->prepare( + "INSERT INTO process_instances + (subject_type, subject_id, person_id, process_definition_id, current_node_id, current_status, current_reason, suggested_next_step, run_number, last_activity_at, data_json) + VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), '{}')" + ); + $stmt->execute([ + $subjectType, $subjectId, $personIdVal, $defId, $startNodeId, $status, $reason, $nextStep, $runNumber + ]); + + $instanceId = $this->pdo->lastInsertId(); + $this->addEvent($instanceId, 'system', 'Process started.', $startNodeId, [], $userId); + + $stmt = $this->pdo->prepare("SELECT * FROM process_instances WHERE id = ?"); + $stmt->execute([$instanceId]); + $instance = $stmt->fetch(\PDO::FETCH_ASSOC); + } + + if (!$inTransaction) { $this->pdo->commit(); } + + return [ + 'instance_id' => $instance['id'], + 'process_definition_id' => $instance['process_definition_id'], + 'process_code' => $processCode, + 'subject_type' => $instance['subject_type'], + 'subject_id' => $instance['subject_id'], + 'person_id' => $instance['person_id'], + 'current_node_id' => $instance['current_node_id'], + 'current_status' => $instance['current_status'], + 'last_activity_at' => $instance['last_activity_at'], + 'data_json' => $instance['data_json'] + ]; + + } catch (\Exception $e) { + if (!$inTransaction) { $this->pdo->rollBack(); } + throw $e; + } + } +EOD; + +$lastBracePos = strrpos($content, '}'); +if ($lastBracePos !== false) { + $content = substr($content, 0, $lastBracePos) . $newMethod . "\n} +"; + file_put_contents('WorkflowEngine.php', $content); + echo "Method added.\n"; +} else { + echo "Failed to find closing brace.\n"; +} + + diff --git a/patch_we.py b/patch_we.py new file mode 100644 index 0000000..61c2318 --- /dev/null +++ b/patch_we.py @@ -0,0 +1,109 @@ +import re + +with open('WorkflowEngine.php', 'r') as f: + content = f.read() + +new_method = """ + public function getOrCreateInstanceBySubject(string $subjectType, int $subjectId, string $processCode, int $userId, string $mode='resume_or_create'): array { + if (!in_array($subjectType, ['person', 'meeting', 'bni_group', 'organization'])) { + throw new InvalidArgumentException("Invalid subjectType."); + } + if ($subjectId <= 0) { + throw new InvalidArgumentException("subjectId must be > 0."); + } + if (empty($processCode)) { + throw new InvalidArgumentException("processCode cannot be empty."); + } + + $inTransaction = $this->pdo->inTransaction(); + if (!$inTransaction) { $this->pdo->beginTransaction(); } + + try { + $sql = "SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 AND subject_scope = ? ORDER BY version DESC, id DESC LIMIT 1"; + $stmt = $this->pdo->prepare($sql); + $stmt->execute([$processCode, $subjectType]); + $definition = $stmt->fetch(PDO::FETCH_ASSOC); + + if (!$definition) { + $stmt = $this->pdo->prepare("SELECT * FROM process_definitions WHERE code = ? AND is_active = 1 ORDER BY version DESC, id DESC LIMIT 1"); + $stmt->execute([$processCode]); + $definition = $stmt->fetch(PDO::FETCH_ASSOC); + if (!$definition) { + throw new WorkflowNotFoundException("No active process definition found for code '$processCode'"); + } + } + + $defId = $definition['id']; + $defJson = json_decode($definition['definition_json'], true); + $startNodeId = $defJson['start_node_id'] ?? null; + if (!$startNodeId) { + throw new Exception("Process definition missing start_node_id"); + } + + $instance = null; + if ($mode === 'resume_or_create') { + $stmt = $this->pdo->prepare( + "SELECT pi.* FROM process_instances pi\n JOIN process_definitions pd ON pi.process_definition_id = pd.id\n WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?\n ORDER BY pi.id DESC LIMIT 1" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $instance = $stmt->fetch(PDO::FETCH_ASSOC); + } + + if (!$instance) { + $stmt = $this->pdo->prepare( + "SELECT MAX(pi.run_number) \n FROM process_instances pi\n JOIN process_definitions pd ON pi.process_definition_id = pd.id\n WHERE pi.subject_type = ? AND pi.subject_id = ? AND pd.code = ?" + ); + $stmt->execute([$subjectType, $subjectId, $processCode]); + $maxRun = (int)$stmt->fetchColumn(); + $runNumber = $maxRun + 1; + + $personIdVal = ($subjectType === 'person') ? $subjectId : null; + $status = $defJson['nodes'][$startNodeId]['ui_hints']['status'] ?? 'in_progress'; + $reason = $defJson['nodes'][$startNodeId]['ui_hints']['reason'] ?? ''; + $nextStep = $defJson['nodes'][$startNodeId]['ui_hints']['next_step'] ?? ''; + + $stmt = $this->pdo->prepare( + "INSERT INTO process_instances \n (subject_type, subject_id, person_id, process_definition_id, current_node_id, current_status, current_reason, suggested_next_step, run_number, last_activity_at, data_json)\n VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, NOW(), '{}')" + ); + $stmt->execute([ + $subjectType, $subjectId, $personIdVal, $defId, $startNodeId, $status, $reason, $nextStep, $runNumber + ]); + + $instanceId = $this->pdo->lastInsertId(); + $this->addEvent($instanceId, 'system', 'Process started.', $startNodeId, [], $userId); + + $stmt = $this->pdo->prepare("SELECT * FROM process_instances WHERE id = ?"); + $stmt->execute([$instanceId]); + $instance = $stmt->fetch(PDO::FETCH_ASSOC); + } + + if (!$inTransaction) { $this->pdo->commit(); } + + return [ + 'instance_id' => $instance['id'], + 'process_definition_id' => $instance['process_definition_id'], + 'process_code' => $processCode, + 'subject_type' => $instance['subject_type'], + 'subject_id' => $instance['subject_id'], + 'person_id' => $instance['person_id'], + 'current_node_id' => $instance['current_node_id'], + 'current_status' => $instance['current_status'], + 'last_activity_at' => $instance['last_activity_at'], + 'data_json' => $instance['data_json'] + ]; + + } catch (Exception $e) { + if (!$inTransaction) { $this->pdo->rollBack(); } + throw $e; + } + } +" + +if "function getOrCreateInstanceBySubject" not in content: + last_brace_idx = content.rfind('}') + content = content[:last_brace_idx] + new_method + "\n}\n" + with open('WorkflowEngine.php', 'w') as f: + f.write(content) + print("Method added.") +else: + print("Method already exists.") diff --git a/process_definitions.php b/process_definitions.php index 69f7535..2cccae8 100644 --- a/process_definitions.php +++ b/process_definitions.php @@ -41,7 +41,7 @@ $processes = $stmt->fetchAll(PDO::FETCH_ASSOC); @@ -67,6 +67,15 @@ $processes = $stmt->fetchAll(PDO::FETCH_ASSOC);
    +
    + + +