fix bugs

Admin/Install/Interfaces/DatabaseExchanger/Lang/en.lang.php

@@ -29,6 +29,10 @@ return [
     'Connection'        => 'Connection',
     'Self'              => 'Self',
     'Custom'            => 'Custom',
+    'Column1'           => 'Column1',
+    'Column2'           => 'Column2',
+    'Filter1'           => 'Filter1',
+    'Filter2'           => 'Filter2',
     'SrcType'           => 'Src-Type',
     'DestType'          => 'Dest-Type',
     'IsPrimary'         => 'Is Primary?',

Admin/Install/Navigation.install.json

@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Exchange",
-        "uri": "{/base}/admin/exchange/log/list?{?}",
+        "uri": "{/base}/admin/exchange/log/list",
         "target": "self",
         "icon": null,
         "order": 50,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Dashboard",
-                "uri": "{/base}/admin/exchange/log/list?{?}",
+                "uri": "{/base}/admin/exchange/log/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Import",
-                "uri": "{/base}/admin/exchange/import/list?{?}",
+                "uri": "{/base}/admin/exchange/import/list",
                 "target": "self",
                 "icon": null,
                 "order": 5,
@@ -49,7 +49,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Export",
-                "uri": "{/base}/admin/exchange/export/list?{?}",
+                "uri": "{/base}/admin/exchange/export/list",
                 "target": "self",
                 "icon": null,
                 "order": 10,

Admin/Installer.php

@@ -14,6 +14,7 @@ declare(strict_types=1);
 
 namespace Modules\Exchange\Admin;
 
+use Modules\Exchange\Admin\Install\Media;
 use Modules\Exchange\Models\NullInterfaceManager;
 use phpOMS\Application\ApplicationAbstract;
 use phpOMS\Config\SettingsInterface;
@@ -46,6 +47,7 @@ final class Installer extends InstallerAbstract
     public static function install(ApplicationAbstract $app, ModuleInfo $info, SettingsInterface $cfgHandler) : void
     {
         parent::install($app, $info, $cfgHandler);
+        Media::install($app, self::PATH);
 
         $interfaces = \scandir(__DIR__ . '/Install/Interfaces');
         if ($interfaces === false) {

Controller/ApiController.php

@@ -25,7 +25,6 @@ use Modules\Exchange\Models\PermissionCategory;
 use Modules\Exchange\Models\Report;
 use Modules\Exchange\Models\SettingsEnum;
 use Modules\Media\Models\CollectionMapper;
-use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\NullCollection;
 use Modules\Media\Models\PathSettings;
 use Modules\Organization\Models\UnitMapper;
@@ -205,62 +204,24 @@ final class ApiController extends Controller
             return;
         }
 
-        if (!empty($uploadedFiles = $request->files)) {
+        $files = new NullCollection();
-            $path = '/Modules/Exchange/Interface/' . $request->getData('title');
+        if (!empty($request->files)) {
+            $path = '/Modules/Exchange/Interfaces/' . $request->getData('title');
 
             /** @var \Modules\Media\Models\Media[] $uploaded */
-            $uploaded = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
+            $files = $this->app->moduleManager->get('Media', 'Api')->uploadFiles(
                 names: $request->getDataList('names'),
                 fileNames: $request->getDataList('filenames'),
-                files: $uploadedFiles,
+                files: $request->files,
                 account: $request->header->account,
                 basePath: __DIR__ . '/../../../Modules/Media/Files' . $path,
                 virtualPath: $path,
-                pathSettings: PathSettings::FILE_PATH
+                pathSettings: PathSettings::FILE_PATH,
+                type: $request->getDataInt('type')
             );
-
-            $collection = null;
-            foreach ($uploaded as $media) {
-                if ($request->hasData('type')) {
-                    $this->createModelRelation(
-                        $request->header->account,
-                        $media->id,
-                        $request->getDataInt('type'),
-                        MediaMapper::class,
-                        'types',
-                        '',
-                        $request->getOrigin()
-                    );
-                }
-
-                if ($collection === null) {
-                    /** @var \Modules\Media\Models\Collection $collection */
-                    $collection = MediaMapper::getParentCollection($path)
-                        ->limit(1)
-                        ->execute();
-
-                    if ($collection->id === 0) {
-                        $collection = $this->app->moduleManager->get('Media')->createRecursiveMediaCollection(
-                            $path,
-                            $request->header->account,
-                            __DIR__ . '/../../../Modules/Media/Files' . $path,
-                        );
-                    }
-                }
-
-                $this->createModelRelation(
-                    $request->header->account,
-                    $collection->id,
-                    $media->id,
-                    CollectionMapper::class,
-                    'sources',
-                    '',
-                    $request->getOrigin()
-                );
-            }
         }
 
-        $interface = $this->createInterfaceFromRequest($request, $collection?->id ?? 0);
+        $interface = $this->createInterfaceFromRequest($request, empty($files->sources) ? 0 : $files->id);
 
         $this->createModel($request->header->account, $interface, InterfaceManagerMapper::class, 'interface', $request->getOrigin());
         $this->createStandardCreateResponse($request, $response, $interface);

Controller/BackendController.php

@@ -50,21 +50,15 @@ final class BackendController extends Controller
         $view->setTemplate('/Modules/Exchange/Theme/Backend/exchange-log-list');
         $view->data['nav'] = $this->app->moduleManager->get('Navigation')->createNavigationMid(1007001001, $request, $response);
 
-        $mapper = ExchangeLogMapper::getAll()
+        $view->data['logs'] = ExchangeLogMapper::getAll()
             ->with('exchange')
             ->with('createdBy')
-            ->limit(50);
+            ->limit(50)
-
+            ->paginate(
-        if ($request->getData('ptype') === 'p') {
+                'id',
-            $view->data['logs'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '<')
+                $request->getDataString('ptype') ?? '',
-                ->execute();
+                $request->getDataInt('offset')
-        } elseif ($request->getData('ptype') === 'n') {
+            )->executeGetArray();
-            $view->data['logs'] = $mapper->where('id', $request->getDataInt('offset') ?? 0, '>')
-                ->execute();
-        } else {
-            $view->data['logs'] = $mapper->where('id', 0, '>')
-                ->execute();
-        }
 
         return $view;
     }

Theme/Backend/exchange-import.tpl.php

@@ -19,6 +19,4 @@ echo $this->data['nav']->render();
 
 $interface = $this->data['interface'];
 
-$a = $interface->source->getAbsolutePath();
-
 include $interface->source->getAbsolutePath() . '/import.tpl.php';