v.2.14

Update migrations

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"}

commands/GETReports.php

@@ -21,6 +21,7 @@ class GETReports extends HRCCommand implements HRCCommandInterface {
 					'end_date' => date('d.m.Y', strtotime($report['end_date'])),
 				);
 			}
+			if (isset($data)) {
 				return [
 					'status' => 'success',
 					'reports' => $data,
@@ -31,5 +32,11 @@ class GETReports extends HRCCommand implements HRCCommandInterface {
 					'reports' => [],
 				];
 			}
+		} else {
+			return [
+				'status' => 'success',
+				'reports' => [],
+			];
+		}
 	}
 }

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"
   },

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) {
+		// function dirDel($dir) {
-			$d = opendir($dir);
+		// 	$d = opendir($dir);
-			while (($entry = readdir($d)) !== false) {
+		// 	while (($entry = readdir($d)) !== false) {
-				if ($entry != "." && $entry != "..") {
+		// 		if ($entry != "." && $entry != "..") {
-					if (is_dir($dir . "/" . $entry)) {
+		// 			if (is_dir($dir . "/" . $entry)) {
-						dirDel($dir . "/" . $entry);
+		// 				dirDel($dir . "/" . $entry);
-					} else {
+		// 			} else {
-						unlink($dir . "/" . $entry);
+		// 				unlink($dir . "/" . $entry);
-					}
+		// 			}
-				}
+		// 		}
-			}
+		// 	}
-			closedir($d);
+		// 	closedir($d);
-			rmdir($dir);
+		// 	rmdir($dir);
-		}
+		// }
 		if (file_exists(CORE_PATH . '/../Settings/web/')) {
 			dirDel(CORE_PATH . '/../Settings/web/');
 		} else {

module.ini

@@ -1,5 +1,5 @@
 [info]
 name=V1
-version=2.13
+version=2.14
 [build]
-version=2.13
+version=2.14

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') {

web/views/reports/index.html

@@ -150,6 +150,10 @@
         <div ui-include="'../views/out.html'"></div>
 </div>
 
+<div class="modal fade" id="preload-modal" data-backdrop="true">
+    <div ui-include="'../views/shifts/preload.html'"></div>
+</div>
+
 <script type="text/javascript" src="/libs/js/moment/locale/ru.js"></script>
 
 <script type="text/javascript">