Develop

App/Controllers/ModuleExtendedCDRsController.php

@@ -21,6 +21,7 @@
 use Modules\ModuleExtendedCDRs\Lib\CacheManager;
 use Modules\ModuleExtendedCDRs\Lib\GetReport;
 use Modules\ModuleExtendedCDRs\Lib\HistoryParser;
+use Modules\ModuleExtendedCDRs\Lib\RestAPI\Controllers\ApiController;
 use Modules\ModuleExtendedCDRs\Models\CallHistory;
 use Modules\ModuleExtendedCDRs\Models\ExportRules;
 use Modules\ModuleExtendedCDRs\Models\ModuleExtendedCDRs;
@@ -145,8 +146,12 @@ public function indexAction(): void
         $this->view->form = new ModuleExtendedCDRsForm($settings, $options);
         $this->view->pick("{$this->moduleDir}/App/Views/index");
 
+        $queues = CallQueues::find(['columns' => ['uniqid As id', 'name']])->toArray();
+        if(!empty($queues)){
+            $queues[] = ['id' => '-', "name" => Util::translate('repModuleExtendedCDRs_WithOutQueues')];
+        }
         // Список выбора очередей.
-        $this->view->queues = CallQueues::find(['columns' => ['id', 'name']]);
+        $this->view->queues = $queues;
         $this->view->groups = [];
 
         if(class_exists('\Modules\ModuleUsersGroups\Models\UsersGroups')){
@@ -183,6 +188,16 @@ public function indexAction(): void
             }
         }
 
+        foreach ($this->view->queues as $queue){
+            foreach ($filterNumbers as $number){
+                if('queue_'.$queue['id'] === $number){
+                    $additionalFilter[] = [
+                        'name'   => $queue['name'],
+                        'number' => $number
+                    ];
+                }
+            }
+        }
         foreach ($this->view->users as $user){
             foreach ($filterNumbers as $number){
                 if($user['number'] === $number){
@@ -193,7 +208,32 @@ public function indexAction(): void
                 }
             }
         }
-        $this->view->dateRangeSelector      = $searchSettings['dateRangeSelector']??'';
+        $pDateRangeSelector  = $_REQUEST['dateRangeSelector']??'';
+        if(!empty($pDateRangeSelector)){
+            $this->view->dateRangeSelector      = $pDateRangeSelector;
+            $this->view->pDateRangeSelector      = $pDateRangeSelector;
+            $additionalFilter = [];
+            foreach ($this->view->queues as $queue){
+                if($queue['id'] === $_REQUEST['queue']??'' ){
+                    $additionalFilter[] = [
+                        'name'   => $queue['name'],
+                        'number' => 'queue_'.$queue['id']
+                    ];
+                }
+            }
+            $this->view->pAdditionalFilterString = implode(',',array_column($additionalFilter, 'number'));
+        }else{
+            $this->view->pDateRangeSelector      = '';
+            $this->view->pAdditionalFilterString = '-';
+            $this->view->dateRangeSelector      = $searchSettings['dateRangeSelector']??'';
+        }
+
+        $pReportNameID = $_REQUEST['reportNameID']??'';
+        if($pReportNameID === ReportSettings::REPORT_MAIN){
+            $this->view->currentReportNameID = $pReportNameID;
+            $this->view->currentVariantId    = null;
+        }
+
         $this->view->additionalFilter       = $additionalFilter;
         $this->view->additionalFilterString = implode(',',array_column($additionalFilter, 'number'));
         $this->view->accessData  = $this->getUserData();
@@ -215,6 +255,12 @@ private function getVariantsReports(&$searchSettings)
                 'isMain' => 0,
                 'variantName' => Util::translate('repModuleExtendedCDRs_'.ReportSettings::REPORT_OUTGOING_EMPLOYEE_CALLS)
             ],
+            ReportSettings::REPORT_QUEUES => [
+                'searchText' => '{}',
+                'minBillSec' => 0,
+                'isMain' => 0,
+                'variantName' => Util::translate('repModuleExtendedCDRs_'.ReportSettings::REPORT_QUEUES)
+            ],
         ];
         $filterVariantReport = [
             'userID=:userID:',
@@ -588,6 +634,21 @@ public function getHistoryAction(): void
             $this->view->$key = $value;
         }
     }
+    public function getCdrQueueAction(): void
+    {
+        $this->view->draw = $this->request->get('draw');
+        $searchPhrase     = $this->request->get('search');
+        $length           = is_numeric($this->request->get('length'))?(int)$this->request->get('length'):null;
+
+        $gr = new GetReport();
+        $params = [];
+        $view = ApiController::aggregateCdrData($gr->historyQueue($searchPhrase['value']??'',  $this->request->get('start'), $length));
+        foreach ($view as $key => $value) {
+            $this->view->$key = $value;
+        }
+        $this->view->params = $params;
+        $this->view->length = count($view);
+    }
 
     /**
      * Запрос отвчета по исходящим сотрудников
@@ -597,9 +658,9 @@ public function getOutgoingEmployeeCallsAction(): void
     {
         $this->view->draw = $this->request->get('draw');
         $searchPhrase     = $this->request->get('search');
-        $length           = is_numeric($this->request->get('length'))?(int)$this->request->get('length'):null;
+        // $length           = is_numeric($this->request->get('length'))?(int)$this->request->get('length'):null;
         $gr = new GetReport();
-        $view = $gr->outgoingEmployeeCalls($searchPhrase['value']??'',  $this->request->get('start'), $length);
+        $view = $gr->outgoingEmployeeCalls($searchPhrase['value']??'');
         foreach ($view as $key => $value) {
             $this->view->$key = $value;
         }

App/Views/index.volt

@@ -1,6 +1,8 @@
 <div id="menu-reports"  style="display: none;" class="ui fluid popup bottom left transition hidden">
   <input id="currentReportNameID" type="hidden" name="filters" value="{{currentReportNameID}}">
   <input id="currentVariantId" type="hidden" name="filters" value="{{currentVariantId}}">
+  <input id="pDateRangeSelector" type="hidden" name="filters" value="{{pDateRangeSelector}}">
+  <input id="pAdditionalFilterString" type="hidden" name="filters" value="{{pAdditionalFilterString}}">
 
   <div class="ui four column relaxed equal height divided grid">
        {% for variantId,variantsData in mainReports %}
@@ -122,9 +124,9 @@
                     </a>
                  </div>
              </div>
-             <div class="ui two wide column" style="height: 40px;">
+             <div class="ui column" style="height: 40px; display: flex; justify-content: flex-end; flex: 1;">
                  <div class="ui action input">
-                    <input style="height: 40px;" type="search" id="globalsearch" placeholder="{{ t._('repModuleExtendedCDRs_FindCallsPlaceholder') }}" aria-controls="KeysTable">
+                    <input style="height: 40px; width: 200px; min-width: 150px;" type="search" id="globalsearch" placeholder="{{ t._('repModuleExtendedCDRs_FindCallsPlaceholder') }}" aria-controls="KeysTable">
                     <button style="height: 40px;" id="createExcelButton" class="ui icon basic button"> <i class="green file excel outline icon"></i></button>
                     <button style="height: 40px;" id="createPdfButton" class="ui icon basic button"> <i class="red file pdf outline icon"></i></button>
                     <button style="height: 40px;" id="downloadRecords" class="ui icon basic button"> <i class="download icon"></i></button>
@@ -134,7 +136,7 @@
                  </div>
              </div>
          </div>
-         <div class="ui row" style="padding-top:0; padding-left:9px">
+          <div class="ui row" style="padding-top: 10px; padding-left:9px; display: flex; justify-content: space-between; align-items: center;">
              <div id='additionalFilter' class="ui multiple dropdown">
                <input type="hidden" name="filters" value="{{additionalFilterString}}">
                <i class="filter icon"></i>
@@ -152,11 +154,20 @@
                  <div class="scrolling menu">
                     {% for group in groups %}
                     <div class="item" data-value="group_{{ group['id'] }}">
-                    <i class="users icon"></i>
+                    <i class="sitemap icon"></i>
                     Отдел: {{ group['name'] }}
                     </div>
                     {% endfor %}
                     <h4 class="ui horizontal divider header"></h4>
+
+                    {% for queue in queues %}
+                    <div class="item" data-value="queue_{{ queue['id'] }}">
+                    <i class="users icon"></i>
+                    Очередь: {{ queue['name'] }}
+                    </div>
+                    {% endfor %}
+                    <h4 class="ui horizontal divider header"></h4>
+
                     {% for user in users %}
                     <div class="item" data-value="{{ user['number'] }}">
                     <i class="user icon"></i>
@@ -168,6 +179,25 @@
                </div>
 
              </div>
+             <div id="minBillSecContainer" style="margin-right: 18px; display: flex; align-items: center; white-space: nowrap;">
+               <label style="margin-right: 10px; line-height: 32px; font-weight: 600;">{{ t._('repModuleExtendedCDRs_Form_minBillSec') }}:</label>
+               <div id="currentMinBillSecComp" class="ui basic compact button dropdown" data-value=">" style="height: 32px; min-width: 40px; padding: 8px 10px; line-height: 16px;">
+                  &gt;
+                  <div class="menu">
+                    <div class="item" data-value=">">&gt;</div>
+                    <div class="item" data-value=">=">&gt;=</div>
+                    <div class="item" data-value="<">&lt;</div>
+                    <div class="item" data-value="<=">&lt;=</div>
+                    <div class="item" data-value="=">=</div>
+                  </div>
+                </div>
+                <div class="ui mini right labeled input" style="margin-left: 5px; width: 110px;">
+                  <input type="number" id="currentMinBillSec" placeholder="0" min="0" max="1000" maxlength="6" style="text-align: right; height: 32px; padding: 5px 8px; width: 60px;">
+                  <div class="ui basic label" style="height: 32px; line-height: 20px; padding: 5px 10px; font-size: 12px;">
+                    {{ t._('repModuleExtendedCDRs_Form_minBillSec_s') }}
+                  </div>
+                </div>
+             </div>
          </div>
      </div>
 
@@ -191,6 +221,29 @@
          </table>
      </div>
 
+     <div id="CdrQueue-table-div">
+         <table id="CdrQueue-table" data-report-name="CdrQueue" class="ui small very compact single line unstackable celled striped table ">
+             <thead>
+             <tr>
+                 <th class="one wide">{{ t._('repModuleExtendedCDRs_CdrQueue_Date') }}</th>
+                 <th class="three wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_Queue') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_TotalCalls') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_Answered') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_Missed') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_AnsweredQueue') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_AvgWaitTime') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_AvgMissed') }}</th>
+                 <th class="one wide center aligned">{{ t._('repModuleExtendedCDRs_CdrQueue_AvgWaitTimeQueue') }}</th>
+             </tr>
+             </thead>
+             <tbody>
+             <tr>
+                 <td colspan="9" class="dataTables_empty">{{ t._('dt_TableIsEmpty') }}</td>
+             </tr>
+             </tbody>
+         </table>
+     </div>
+
      <br>
      <div id="CallDetails-table-div">
 

CLAUDE.md

@@ -0,0 +1,138 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## CRITICAL RULES
+
+- **Git commit and push ONLY with explicit user permission.** Never run `git commit` or `git push` without the user explicitly asking for it.
+
+## Project Overview
+
+ModuleExtendedCDRs is a MikoPBX extension module for Extended Call Detail Records management and reporting. It synchronizes CDR data from Asterisk, provides call history views, generates reports (PDF/XLSX/JSON), exports via webhooks, and delivers scheduled reports by email.
+
+- **Language**: PHP 7.4.6+
+- **Framework**: Phalcon 4.0 (MVC)
+- **Namespace**: `Modules\ModuleExtendedCDRs\`
+- **License**: GPL-3.0-or-later
+- **Module ID**: `ModuleExtendedCDRs`
+
+## Commands
+
+```bash
+# Install PHP dependencies
+composer install
+
+# Syntax check
+php -l <file.php>
+
+# Run test script (development)
+php bin/test.php
+
+# Background workers (run on PBX system)
+php bin/ConnectorDB.php    # CDR synchronization daemon
+php bin/SyncRecords.php    # Webhook export worker
+php bin/report2email.php   # Scheduled email reports
+```
+
+## Build & CI
+
+GitHub Actions workflow (`.github/workflows/build.yml`) triggers on push to `master`/`develop` and uses the shared `mikopbx/.github-workflows` reusable workflow for building and publishing releases. Version is auto-incremented from initial version `1.33`.
+
+## Architecture
+
+### Data Flow
+
+```
+Asterisk CDR DB → ConnectorDB worker → SQLite (db/cdr.db)
+                                            ↓
+                              GetReport (formatting/filtering)
+                                            ↓
+                         API / PDF / XLSX / Webhook / Email
+```
+
+### Key Layers
+
+| Layer | Location | Purpose |
+|-------|----------|---------|
+| Controllers | `App/Controllers/` | Admin panel request handling |
+| Views | `App/Views/` | Volt templates for UI |
+| Forms | `App/Forms/` | Phalcon form definitions |
+| Business Logic | `Lib/` | Report generation, CDR parsing, caching |
+| REST API | `Lib/RestAPI/Controllers/` | External API endpoints |
+| Models | `Models/` | Phalcon ORM (5 models) |
+| Workers | `bin/` | Background daemons (extend `WorkerBase`) |
+| Setup | `Setup/` | Module install/uninstall |
+| i18n | `Messages/` | 31 language translations |
+| Assets | `public/assets/` | JS, CSS, images |
+
+### Key Classes
+
+- **`GetReport`** (`Lib/GetReport.php`) — Central report engine: `history()`, `historyDetail()`, `outgoingEmployeeCalls()`, `exportToPdf()`, `exportToXlsx()`
+- **`ConnectorDB`** (`bin/ConnectorDB.php`) — Daemon syncing Asterisk CDR → local SQLite, extends `WorkerBase`
+- **`HistoryParser`** (`Lib/HistoryParser.php`) — CDR parsing and call history assembly
+- **`CacheManager`** (`Lib/CacheManager.php`) — Redis cache for sync progress tracking
+- **`ExtendedCDRsConf`** (`Lib/ExtendedCDRsConf.php`) — REST API route registration and module config
+- **`ExtendedCDRsMain`** (`Lib/ExtendedCDRsMain.php`) — Module lifecycle (`checkModuleWorkProperly`, `startAllServices`)
+- **`ApiController`** (`Lib/RestAPI/Controllers/ApiController.php`) — REST endpoints for export/download
+
+### Database
+
+- **Module settings**: MikoPBX main DB (table `m_ModuleExtendedCDRs`)
+- **CDR data**: SQLite at `db/cdr.db` (managed by `CdrDbProvider`)
+
+### Models
+
+- `ModuleExtendedCDRs` — Module configuration/settings
+- `ReportSettings` — Per-user report variant preferences
+- `CallHistory` — Call history records
+- `ExportRules` — Webhook export rules
+- `ExportResults` — Export result tracking
+
+### REST API
+
+Base path: `/pbxcore/api/modules/ModuleExtendedCDRs/`
+
+- `GET /records` — Download call recordings
+- `GET /exportHistory` — Export call history (JSON/PDF/XLSX)
+- `GET /exportHistoryDetail` — Detailed CDR export
+- `GET /exportOutgoingEmployeeCalls` — Employee call reports
+- `GET /downloads` — File downloads
+
+### Integration Points
+
+- **MikoPBX Core**: AMI, Beanstalk queues, CDR database, module lifecycle hooks
+- **Other Modules**: ModuleUsersUI (RBAC/ACL), ModuleUsersGroups (group filtering)
+- **External**: Webhooks to arbitrary URLs via `ExportRules`
+
+## JavaScript Build
+
+Source files are in `public/assets/js/src/`. After modifying them, compiled files must be generated in `public/assets/js/`.
+
+**IMPORTANT:** Only edit files in `src/` directory. Files in `public/assets/js/*.js` are auto-generated.
+
+Build process uses Babel via PHPStorm File Watcher:
+- See setup: https://docs.mikopbx.com/mikopbx-development/prepare-ide-tools/mac#phpstorm-setup-babel
+- Babel path: `/Users/apor/Developement/MikoPBX/MikoPBXUtils/node_modules/.bin/babel`
+- Presets: `airbnb`
+- Source maps: enabled
+
+To rebuild manually:
+```bash
+cd /Users/apor/Developement/MikoPBX/MikoPBXUtils && \
+cp babel.config.json babel.config.json.bak && \
+echo '{"presets":[["@babel/preset-env",{"targets":{"chrome":50,"ie":11,"firefox":45}}]]}' > babel.config.json && \
+./node_modules/.bin/babel \
+  /Volumes/DevDisk/apor/Developement/MikoPBX/Extensions/ModuleExtendedCDRs/public/assets/js/src/module-export-records-index.js \
+  --out-dir /Volumes/DevDisk/apor/Developement/MikoPBX/Extensions/ModuleExtendedCDRs/public/assets/js/ \
+  --source-maps && \
+mv babel.config.json.bak babel.config.json
+```
+
+## Conventions
+
+- Module extends `PbxExtensionBase` for lifecycle, implements `CDRConfigInterface` for CDR hooks
+- Workers extend `WorkerBase` with ping/heartbeat health checks
+- REST routes registered via `getPBXCoreRESTAdditionalRoutes()` in `ExtendedCDRsConf`
+- Cache keys prefixed with `ModuleExtendedCDRs_`
+- Log files at `/var/log/pbx/ModuleExtendedCDRs/{class}.log` with rotation
+- PSR-4 autoloading, root namespace maps to repository root