✨ Enhance department group management and statistics

remdex · remdex · commit c03df1952d0c · 2025-09-25T13:44:41.000+03:00
- Refactored department group statistics modal for improved performance and clarity
- Implemented transaction handling in department updates to ensure data integrity
- Added unique constraint for department group members to prevent duplicates
- Introduced cleanup scripts for orphan department entries in the database
- Updated changelog and database structure for version 4.71
diff --git a/lhc_web/design/defaulttheme/tpl/lhstatistic/departmentstats.tpl.php b/lhc_web/design/defaulttheme/tpl/lhstatistic/departmentstats.tpl.php
@@ -402,24 +402,9 @@
                     'sort' => false
                 ));
 
-                $departmentGroups = array();
-                if (!empty($departmentGroupMemberships)) {
-                    $groupIds = array();
-                    foreach ($departmentGroupMemberships as $membership) {
-                        $groupIds[] = $membership->dep_group_id;
-                    }
-                    
-                    if (!empty($groupIds)) {
-                        $departmentGroups = erLhcoreClassModelDepartamentGroup::getList(array(
-                            'limit' => false,
-                            'filter' => array('id' => $groupIds),
-                            'sort' => 'name ASC'
-                        ));
-                    }
-                }
                 ?>
                      
-                <?php if (empty($departmentGroups)) : ?>
+                <?php if (empty($departmentGroupMemberships)) : ?>
                     <div class="alert alert-info">
                         <i class="material-icons">info</i>
                         <strong><?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('department/edit','Information');?></strong>
@@ -438,22 +423,22 @@
                                 </tr>
                             </thead>
                             <tbody>
-                                <?php foreach ($departmentGroups as $depGroup) : ?>
+                                <?php foreach ($departmentGroupMemberships as $depGroupmember) : $depGroup = erLhcoreClassModelDepartamentGroup::fetch($depGroupmember->dep_group_id);?>
                                 <tr>
                                     <td>
-                                        <?php echo htmlspecialchars($depGroup->name)?><?php if (erLhcoreClassUser::instance()->hasAccessTo('lhdepartment', 'managegroups')) : ?><a class="ms-1" href="<?php echo erLhcoreClassDesign::baseurl('department/editgroup')?>/<?php echo $depGroup->id?>" title="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('department/edit','Edit group')?>"><i class="material-icons">edit</i></a><?php endif; ?>
+                                        <?php echo htmlspecialchars($depGroup?->name); ?><?php if (erLhcoreClassUser::instance()->hasAccessTo('lhdepartment', 'managegroups')) : ?><a class="ms-1" href="<?php echo erLhcoreClassDesign::baseurl('department/editgroup')?>/<?php echo $depGroup?->id?>" title="<?php echo erTranslationClassLhTranslation::getInstance()->getTranslation('department/edit','Edit group')?>"><i class="material-icons">edit</i></a><?php endif; ?>
                                     </td>
                                     <td>
-                                        <span class="badge bg-success"><?php echo (int)$depGroup->achats_cnt?></span>
+                                        <span class="badge bg-success"><?php echo (int)$depGroup?->achats_cnt?></span>
                                     </td>
                                     <td>
-                                        <span class="badge bg-warning"><?php echo (int)$depGroup->pchats_cnt?></span>
+                                        <span class="badge bg-warning"><?php echo (int)$depGroup?->pchats_cnt?></span>
                                     </td>
                                     <td>
-                                        <span class="badge bg-info"><?php echo (int)$depGroup->bchats_cnt?></span>
+                                        <span class="badge bg-info"><?php echo (int)$depGroup?->bchats_cnt?></span>
                                     </td>
                                     <td>
-                                        <span class="badge bg-secondary"><?php echo (int)$depGroup->inachats_cnt?></span>
+                                        <span class="badge bg-secondary"><?php echo (int)$depGroup?->inachats_cnt?></span>
                                     </td>
                                 </tr>
                                 <?php endforeach; ?>
diff --git a/lhc_web/doc/CHANGELOG.txt b/lhc_web/doc/CHANGELOG.txt
@@ -1,3 +1,86 @@
+4.71v
+
+1. Department Management and User Administration
+   - Enhanced department group statistics modal for better oversight of group performance
+   - Implemented read-only status toggle for department assignments with visual feedback
+   - Added confirmation modal for assigned department edits to prevent accidental changes
+   - Improved user department management with transaction handling for data integrity
+   - Added utility to cleanup orphan departments and maintain database consistency
+   - Enhanced department assignment UI with better UX and simultaneous request prevention
+   - Added filtering for users by assigned departments for improved navigation
+   - Implemented department limitation handling and cache version updates on changes
+   - Added red/green color indicators for operator online status visibility
+
+2. Bot System and Webhook Improvements
+   - Enhanced bot conditions handling with condition identifiers for better query filtering
+   - Updated trigger link display to show bot name alongside trigger name for clarity
+   - Disabled cache for bot actions and conditions to ensure real-time updates
+   - Added 'single_event' support to webhook functionality for better event handling
+   - Implemented webhook search panel with filtering capabilities for easier management
+   - Added event field to webhook search panel and configuration options
+   - Enhanced bot trigger validation with improved button assignment verification
+   - Added support for conditional text generation in bot responses
+   - Implemented 'sub_source' parameter to sendBotResponse for better tracking
+   - Added option to check chat status after REST API calls
+
+3. File Management and Image Processing
+   - Added HEIC image conversion support in verifyaccess.php for modern image formats
+   - Implemented file download restrictions and settings to mail conversation module
+   - Enhanced image verification process with re-verification features
+   - Added modal display for attached image files with better user experience
+   - Implemented resize support for form files to optimize storage and performance
+   - Added option to download files inline with modal interface
+   - Enhanced file extension detection and validation for security
+   - Added fallback options when browser cannot render images
+   - Implemented option to ignore specific image files during verification
+   - Added resize functionality for large mail message screenshots
+
+4. Chat System and Message Handling
+   - Added system message indicating when chat was accepted by operator
+   - Enhanced image handling and conditions in the chat system
+   - Implemented separate events for messages added via incoming webhooks
+   - Added loading spinner overlay to main widget for better user feedback
+   - Enhanced form submission experience with spinner on submit button
+   - Added option to inherit start chat form settings for consistency
+   - Improved message handling with better error display and validation
+   - Enhanced chat search capabilities with message ID search functionality
+   - Added support for raw file embed syntax in chat messages
+   - Implemented conditional text generation for dynamic responses
+
+5. Security and Performance Improvements
+   - Implemented strict locking mechanisms for critical operations
+   - Added transaction handling for operator transfers and chat attribute updates
+   - Enhanced permission checking in export functions for better security
+   - Implemented proper transaction handling for icon operations
+   - Added cache clearing mechanisms for improved performance
+   - Enhanced error handling for failed file downloads and operations
+   - Implemented audit log truncation option from back office
+   - Added better logging for auto assignment operations and error tracking
+   - Enhanced REST API with option to skip empty body requests
+
+6. User Interface and Experience Enhancements
+   - Enhanced department assignment functionality with improved UI feedback
+   - Added 'user-select-none' class to labels for better user experience
+   - Implemented lazy load option for widget theme optimization
+   - Added argument titles to command execution for better clarity
+   - Enhanced form styling with improved input field appearance
+   - Added link to documentation for better user guidance
+   - Updated React app version with enhanced network failure handling
+   - Improved checkbox re-enabling logic after request completion
+   - Added nowrap styling for department group lists for better display
+
+7. System Maintenance and Bug Fixes
+   - Fixed issue #2298, #2304, #2305, #2306 addressing various system bugs
+   - Updated dependencies and php-imap reference for security and compatibility
+   - Enhanced error handling for non-existing users in reports
+   - Fixed replacement process and edge case scenarios
+   - Improved file type validation and extension setting for known formats
+   - Fixed undefined display issues in pending wait time calculations
+   - Enhanced aggregation queries by removing duplicates for better performance
+   - Updated default translations for better internationalization support
+
+execute doc/update_db/update_339.sql for update
+
 4.70v
 
 1. REST API and Bot Enhancements
diff --git a/lhc_web/doc/update_db/structure.json b/lhc_web/doc/update_db/structure.json
@@ -11865,6 +11865,12 @@
       },
       "old" : ["device_token_device_type"]
     },
+    "lh_departament_group_member" : {
+      "new" : {
+        "dep_group_id_dep_id" : "DELETE t1 FROM `lh_departament_group_member` t1 INNER JOIN `lh_departament_group_member` t2 ON t1.`dep_group_id` = t2.`dep_group_id` AND t1.`dep_id` = t2.`dep_id` WHERE t1.id > t2.id; ALTER TABLE `lh_departament_group_member` ADD UNIQUE `dep_group_id_dep_id` (`dep_group_id`, `dep_id`);"
+      },
+      "old" : ["dep_group_id"]
+    },
     "lh_chat_blocked_user" : {
       "new" : {
         "nick" : "ALTER TABLE `lh_chat_blocked_user` ADD INDEX `nick` (`nick`);",
@@ -12262,7 +12268,7 @@
     "lh_abstract_rest_api_key": "CREATE TABLE `lh_abstract_rest_api_key` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `api_key` varchar(50) NOT NULL,  `user_id` int(11) NOT NULL,  `active` int(11) NOT NULL DEFAULT '0',  PRIMARY KEY (`id`),  KEY `user_id` (`user_id`),  KEY `api_key_active` (`api_key`,`active`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
     "lh_abstract_rest_api_key_remote": "CREATE TABLE `lh_abstract_rest_api_key_remote` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `api_key` varchar(50) NOT NULL, `username` varchar(50) NOT NULL, `name` varchar(50) NOT NULL,  `host` varchar(250) NOT NULL, `active` tinyint(1) NOT NULL DEFAULT '0', `position` int(11) NOT NULL DEFAULT '0',  PRIMARY KEY (`id`), KEY `active` (`active`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
     "lh_departament_group_user": "CREATE TABLE `lh_departament_group_user` (\n  `id` int(11) NOT NULL AUTO_INCREMENT,\n  `dep_group_id` int(11) NOT NULL,\n  `user_id` int(11) NOT NULL,\n  `read_only` tinyint(1) unsigned NOT NULL DEFAULT 0,\n  `exc_indv_autoasign` tinyint(1) unsigned NOT NULL DEFAULT 0,\n  `assign_priority` int(11) unsigned NOT NULL DEFAULT 0,\n  `chat_min_priority` int(11) unsigned NOT NULL DEFAULT 0,\n  `chat_max_priority` int(11) unsigned NOT NULL DEFAULT 0,\n  PRIMARY KEY (`id`),\n  KEY `dep_group_id` (`dep_group_id`),\n  KEY `user_id` (`user_id`)\n) ENGINE=InnoDB AUTO_INCREMENT=382 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci\n",
-    "lh_departament_group_member": "CREATE TABLE `lh_departament_group_member` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `dep_id` int(11) NOT NULL,  `dep_group_id` int(11) NOT NULL,  PRIMARY KEY (`id`),  KEY `dep_group_id` (`dep_group_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
+    "lh_departament_group_member": "CREATE TABLE `lh_departament_group_member` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `dep_id` int(11) NOT NULL,  `dep_group_id` int(11) NOT NULL,  PRIMARY KEY (`id`), UNIQUE KEY `dep_group_id_dep_id` (`dep_group_id`,`dep_id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
     "lh_departament_limit_group_member": "CREATE TABLE `lh_departament_limit_group_member` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `dep_id` int(11) NOT NULL,  `dep_limit_group_id` int(11) NOT NULL,  PRIMARY KEY (`id`),  KEY `dep_limit_group_id` (`dep_limit_group_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
     "lh_departament_group": "CREATE TABLE `lh_departament_group` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `name` varchar(50) NOT NULL,  PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
     "lh_departament_limit_group": "CREATE TABLE `lh_departament_limit_group` (  `id` int(11) NOT NULL AUTO_INCREMENT,  `name` varchar(50) NOT NULL,`pending_max` int(11) NOT NULL,  PRIMARY KEY (`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci",
diff --git a/lhc_web/doc/update_db/update_339.sql b/lhc_web/doc/update_db/update_339.sql
@@ -0,0 +1,3 @@
+DELETE t1 FROM `lh_departament_group_member` t1 INNER JOIN `lh_departament_group_member` t2 ON t1.`dep_group_id` = t2.`dep_group_id` AND t1.`dep_id` = t2.`dep_id` WHERE t1.id > t2.id;
+DELETE t1 FROM `lh_userdep` t1 INNER JOIN `lh_userdep` t2  ON t1.`user_id` = t2.`user_id` AND t1.`dep_id` = t2.`dep_id` AND t1.`dep_group_id` = t2.`dep_group_id` AND t1.`type` = t2.`type` WHERE t1.id > t2.id AND t1.type = 1;
+ALTER TABLE `lh_departament_group_member` ADD UNIQUE `dep_group_id_dep_id` (`dep_group_id`, `dep_id`);
diff --git a/lhc_web/lib/core/lhcore/lhupdate.php b/lhc_web/lib/core/lhcore/lhupdate.php
@@ -2,9 +2,8 @@
 
 class erLhcoreClassUpdate
 {
-
-    const DB_VERSION = 338;
-    const LHC_RELEASE = 470;
+    const DB_VERSION = 339;
+    const LHC_RELEASE = 471;
 
 	public static function doTablesUpdate($definition){
 		$updateInformation = self::getTablesStatus($definition);
diff --git a/lhc_web/modules/lhdepartment/editgroup.php b/lhc_web/modules/lhdepartment/editgroup.php
@@ -55,16 +55,27 @@
 	$Errors = erLhcoreClassDepartament::validateDepartmentGroup($Departament_group);
 	
     if (count($Errors) == 0)
-    {    	
-        $Departament_group->updateThis();
+    {
+        $db = ezcDbInstance::get();
+        $db->beginTransaction();
 
-        erLhcoreClassDepartament::validateDepartmentGroupDepartments($Departament_group);
+        try {
+            $Departament_group->updateThis();
+            $Departament_group->syncAndLock('`id`');
 
-        erLhcoreClassAdminChatValidatorHelper::clearUsersCache();
+            erLhcoreClassDepartament::validateDepartmentGroupDepartments($Departament_group);
 
-        erLhcoreClassChatEventDispatcher::getInstance()->dispatch('department.edit_department_group',array('department_group' => & $Departament_group));
+            erLhcoreClassAdminChatValidatorHelper::clearUsersCache();
 
-        erLhcoreClassChatStatsResque::updateDepartmentGroupStats($Departament_group);
+            erLhcoreClassChatEventDispatcher::getInstance()->dispatch('department.edit_department_group',array('department_group' => & $Departament_group));
+
+            erLhcoreClassChatStatsResque::updateDepartmentGroupStats($Departament_group);
+
+            $db->commit();
+        } catch (Exception $e) {
+            $db->rollback();
+            $tpl->set('errors',[$e->getMessage()]);
+        }
 
         if (isset($_POST['Save_departament'])) {
             erLhcoreClassModule::redirect('department/group');
diff --git a/lhc_web/modules/lhinstall/install.php b/lhc_web/modules/lhinstall/install.php
@@ -1909,7 +1909,7 @@
                   `dep_id` int(11) NOT NULL,
                   `dep_group_id` int(11) NOT NULL,
                   PRIMARY KEY (`id`),
-                  KEY `dep_group_id` (`dep_group_id`)
+                  UNIQUE KEY `dep_group_id_dep_id` (`dep_group_id`,`dep_id`)
                 ) ENGINE=InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");
 
                     $db->query("CREATE TABLE `lh_generic_bot_rest_api` (`id` bigint(20) NOT NULL AUTO_INCREMENT PRIMARY KEY, `name` varchar(50) NOT NULL, `description` varchar(250), `configuration` longtext NOT NULL) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;");

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+DELETE t1 FROM `lh_departament_group_member` t1 INNER JOIN `lh_departament_group_member` t2 ON t1.`dep_group_id` = t2.`dep_group_id` AND t1.`dep_id` = t2.`dep_id` WHERE t1.id > t2.id;
	`2`	+DELETE t1 FROM `lh_userdep` t1 INNER JOIN `lh_userdep` t2 ON t1.`user_id` = t2.`user_id` AND t1.`dep_id` = t2.`dep_id` AND t1.`dep_group_id` = t2.`dep_group_id` AND t1.`type` = t2.`type` WHERE t1.id > t2.id AND t1.type = 1;
	`3`	+ALTER TABLE `lh_departament_group_member` ADD UNIQUE `dep_group_id_dep_id` (`dep_group_id`, `dep_id`);