diff --git a/Logs/04.02.2022_00.23.38.log b/Logs/04.02.2022_00.23.38.log new file mode 100644 index 0000000..dfb600f --- /dev/null +++ b/Logs/04.02.2022_00.23.38.log @@ -0,0 +1 @@ +{"status":"success","version":"2.13","file":"http:\/\/portal.hrc.by\/uploads\/modules\/v1\/2.13\/build.zip","name":"v1"} diff --git a/commands/GETReports.php b/commands/GETReports.php index 085d064..3e75a04 100644 --- a/commands/GETReports.php +++ b/commands/GETReports.php @@ -21,10 +21,17 @@ class GETReports extends HRCCommand implements HRCCommandInterface { 'end_date' => date('d.m.Y', strtotime($report['end_date'])), ); } - return [ - 'status' => 'success', - 'reports' => $data, - ]; + if (isset($data)) { + return [ + 'status' => 'success', + 'reports' => $data, + ]; + } else { + return [ + 'status' => 'success', + 'reports' => [], + ]; + } } else { return [ 'status' => 'success', diff --git a/composer.json b/composer.json index bb678f9..a875ac8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "hrc-admin/hello-world", - "version": "2.13", + "version": "2.14", "require": { "horeca/admin-php-module-core": "dev-master" }, diff --git a/database/migrations/2022_02_01_014430_delete_settings_frontend_folder.php b/database/migrations/2022_02_01_014430_delete_settings_frontend_folder.php index a5670eb..8a5fe82 100644 --- a/database/migrations/2022_02_01_014430_delete_settings_frontend_folder.php +++ b/database/migrations/2022_02_01_014430_delete_settings_frontend_folder.php @@ -10,20 +10,20 @@ class DeleteSettingsFrontendFolder extends Migration { * @return void */ public function up() { - function dirDel($dir) { - $d = opendir($dir); - while (($entry = readdir($d)) !== false) { - if ($entry != "." && $entry != "..") { - if (is_dir($dir . "/" . $entry)) { - dirDel($dir . "/" . $entry); - } else { - unlink($dir . "/" . $entry); - } - } - } - closedir($d); - rmdir($dir); - } + // function dirDel($dir) { + // $d = opendir($dir); + // while (($entry = readdir($d)) !== false) { + // if ($entry != "." && $entry != "..") { + // if (is_dir($dir . "/" . $entry)) { + // dirDel($dir . "/" . $entry); + // } else { + // unlink($dir . "/" . $entry); + // } + // } + // } + // closedir($d); + // rmdir($dir); + // } if (file_exists(CORE_PATH . '/../Settings/web/')) { dirDel(CORE_PATH . '/../Settings/web/'); } else { diff --git a/module.ini b/module.ini index a65b0de..07fdcd2 100644 --- a/module.ini +++ b/module.ini @@ -1,5 +1,5 @@ [info] name=V1 -version=2.13 +version=2.14 [build] -version=2.13 +version=2.14 diff --git a/web/controllers/reports.js b/web/controllers/reports.js index 6639409..b0d5d1d 100644 --- a/web/controllers/reports.js +++ b/web/controllers/reports.js @@ -34,6 +34,7 @@ }; $scope.deleteReport = function (report) { + $('#preload-modal').modal(); Notification.primary('Дождитесь удаления! Страница обновится автоматически.'); smartRequest.post('v1/deletedata', { value: 'delete_report', @@ -46,6 +47,7 @@ setTimeout(function() { //location.reload(); $scope.update(); + $('#preload-modal').modal('hide'); }, 1000); } if ($scope.status == 'error') { diff --git a/web/views/reports/index.html b/web/views/reports/index.html index 74fcd5c..369693e 100644 --- a/web/views/reports/index.html +++ b/web/views/reports/index.html @@ -150,6 +150,10 @@
+