@@ -6,42 +6,42 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateDashboardTables extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - $this->down(); |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + $this->down(); |
|
| 17 | 17 | |
| 18 | - Schema::create('dashboards', function (Blueprint $table) { |
|
| 19 | - $table->increments('id'); |
|
| 20 | - $table->unsignedInteger('user_id'); |
|
| 21 | - $table->string('name', 64); |
|
| 22 | - $table->smallInteger('position')->default(0); |
|
| 23 | - }); |
|
| 18 | + Schema::create('dashboards', function (Blueprint $table) { |
|
| 19 | + $table->increments('id'); |
|
| 20 | + $table->unsignedInteger('user_id'); |
|
| 21 | + $table->string('name', 64); |
|
| 22 | + $table->smallInteger('position')->default(0); |
|
| 23 | + }); |
|
| 24 | 24 | |
| 25 | - Schema::create('dashboard_applets', function (Blueprint $table) { |
|
| 26 | - $table->increments('id'); |
|
| 27 | - $table->unsignedInteger('dashboard_id'); |
|
| 28 | - $table->string('class', 512); |
|
| 29 | - $table->smallInteger('column')->default(1); |
|
| 30 | - $table->smallInteger('row')->default(0); |
|
| 31 | - $table->text('options')->nullable(); |
|
| 25 | + Schema::create('dashboard_applets', function (Blueprint $table) { |
|
| 26 | + $table->increments('id'); |
|
| 27 | + $table->unsignedInteger('dashboard_id'); |
|
| 28 | + $table->string('class', 512); |
|
| 29 | + $table->smallInteger('column')->default(1); |
|
| 30 | + $table->smallInteger('row')->default(0); |
|
| 31 | + $table->text('options')->nullable(); |
|
| 32 | 32 | |
| 33 | - $table->foreign('dashboard_id')->references('id')->on('dashboards'); |
|
| 34 | - }); |
|
| 35 | - } |
|
| 33 | + $table->foreign('dashboard_id')->references('id')->on('dashboards'); |
|
| 34 | + }); |
|
| 35 | + } |
|
| 36 | 36 | |
| 37 | - /** |
|
| 38 | - * Reverse the migrations. |
|
| 39 | - * |
|
| 40 | - * @return void |
|
| 41 | - */ |
|
| 42 | - public function down() |
|
| 43 | - { |
|
| 44 | - Schema::dropIfExists('dashboard_applets'); |
|
| 45 | - Schema::dropIfExists('dashboards'); |
|
| 46 | - } |
|
| 37 | + /** |
|
| 38 | + * Reverse the migrations. |
|
| 39 | + * |
|
| 40 | + * @return void |
|
| 41 | + */ |
|
| 42 | + public function down() |
|
| 43 | + { |
|
| 44 | + Schema::dropIfExists('dashboard_applets'); |
|
| 45 | + Schema::dropIfExists('dashboards'); |
|
| 46 | + } |
|
| 47 | 47 | } |
@@ -6,31 +6,31 @@ |
||
| 6 | 6 | |
| 7 | 7 | class CreateCommondataTable extends Migration |
| 8 | 8 | { |
| 9 | - /** |
|
| 10 | - * Run the migrations. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function up() |
|
| 15 | - { |
|
| 16 | - Schema::create('commondata', function (Blueprint $table) { |
|
| 17 | - $table->bigIncrements('id'); |
|
| 18 | - $table->nestedSet(); |
|
| 9 | + /** |
|
| 10 | + * Run the migrations. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function up() |
|
| 15 | + { |
|
| 16 | + Schema::create('commondata', function (Blueprint $table) { |
|
| 17 | + $table->bigIncrements('id'); |
|
| 18 | + $table->nestedSet(); |
|
| 19 | 19 | |
| 20 | - $table->string('key', 64); |
|
| 21 | - $table->text('value')->nullable(); |
|
| 22 | - $table->integer('position')->nullable()->default(0); |
|
| 23 | - $table->smallInteger('readonly')->nullable()->default(0); |
|
| 24 | - }); |
|
| 25 | - } |
|
| 20 | + $table->string('key', 64); |
|
| 21 | + $table->text('value')->nullable(); |
|
| 22 | + $table->integer('position')->nullable()->default(0); |
|
| 23 | + $table->smallInteger('readonly')->nullable()->default(0); |
|
| 24 | + }); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Reverse the migrations. |
|
| 29 | - * |
|
| 30 | - * @return void |
|
| 31 | - */ |
|
| 32 | - public function down() |
|
| 33 | - { |
|
| 34 | - Schema::dropIfExists('commondata'); |
|
| 35 | - } |
|
| 27 | + /** |
|
| 28 | + * Reverse the migrations. |
|
| 29 | + * |
|
| 30 | + * @return void |
|
| 31 | + */ |
|
| 32 | + public function down() |
|
| 33 | + { |
|
| 34 | + Schema::dropIfExists('commondata'); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -7,198 +7,198 @@ |
||
| 7 | 7 | use Illuminate\Database\Eloquent\Collection; |
| 8 | 8 | |
| 9 | 9 | class CommonData extends Model { |
| 10 | - use NodeTrait; |
|
| 10 | + use NodeTrait; |
|
| 11 | 11 | |
| 12 | - protected $table = 'commondata'; |
|
| 13 | - public $timestamps = false; |
|
| 14 | - protected static $unguarded = true; |
|
| 12 | + protected $table = 'commondata'; |
|
| 13 | + public $timestamps = false; |
|
| 14 | + protected static $unguarded = true; |
|
| 15 | 15 | |
| 16 | - public static function getId($path, $clearCache = false) |
|
| 17 | - { |
|
| 18 | - static $cache; |
|
| 16 | + public static function getId($path, $clearCache = false) |
|
| 17 | + { |
|
| 18 | + static $cache; |
|
| 19 | 19 | |
| 20 | - $parentId = null; |
|
| 21 | - foreach(explode('/', trim($path,'/')) as $nodeKey) { |
|
| 22 | - if ($nodeKey === '') continue; //ignore empty paths |
|
| 20 | + $parentId = null; |
|
| 21 | + foreach(explode('/', trim($path,'/')) as $nodeKey) { |
|
| 22 | + if ($nodeKey === '') continue; //ignore empty paths |
|
| 23 | 23 | |
| 24 | - if (empty($cache[$parentId][$nodeKey])) { |
|
| 25 | - if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) { |
|
| 26 | - return false; |
|
| 27 | - } |
|
| 24 | + if (empty($cache[$parentId][$nodeKey])) { |
|
| 25 | + if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) { |
|
| 26 | + return false; |
|
| 27 | + } |
|
| 28 | 28 | |
| 29 | - $cache[$parentId][$nodeKey] = $node->id; |
|
| 30 | - } |
|
| 29 | + $cache[$parentId][$nodeKey] = $node->id; |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - $parentId = $id = $cache[$parentId][$nodeKey]; |
|
| 33 | - } |
|
| 32 | + $parentId = $id = $cache[$parentId][$nodeKey]; |
|
| 33 | + } |
|
| 34 | 34 | |
| 35 | - return $id; |
|
| 36 | - } |
|
| 35 | + return $id; |
|
| 36 | + } |
|
| 37 | 37 | |
| 38 | - public static function newId($path, $readonly = false) |
|
| 39 | - { |
|
| 40 | - if (! $path = trim($path,'/')) return false; |
|
| 38 | + public static function newId($path, $readonly = false) |
|
| 39 | + { |
|
| 40 | + if (! $path = trim($path,'/')) return false; |
|
| 41 | 41 | |
| 42 | - $id = $parentId = null; |
|
| 43 | - foreach(explode('/', $path) as $nodeKey) { |
|
| 44 | - if ($nodeKey === '') continue; |
|
| 42 | + $id = $parentId = null; |
|
| 43 | + foreach(explode('/', $path) as $nodeKey) { |
|
| 44 | + if ($nodeKey === '') continue; |
|
| 45 | 45 | |
| 46 | - if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) { |
|
| 47 | - $node = self::create([ |
|
| 48 | - 'parent_id' => $parentId, |
|
| 49 | - 'key' => $nodeKey, |
|
| 50 | - 'readonly' => $readonly, |
|
| 51 | - 'position' => self::where('parent_id', $parentId)->count() |
|
| 52 | - ], $parentId? self::find($parentId): null); |
|
| 53 | - } |
|
| 46 | + if (! $node = self::where('parent_id', $parentId)->where('key', $nodeKey)->first()) { |
|
| 47 | + $node = self::create([ |
|
| 48 | + 'parent_id' => $parentId, |
|
| 49 | + 'key' => $nodeKey, |
|
| 50 | + 'readonly' => $readonly, |
|
| 51 | + 'position' => self::where('parent_id', $parentId)->count() |
|
| 52 | + ], $parentId? self::find($parentId): null); |
|
| 53 | + } |
|
| 54 | 54 | |
| 55 | - $parentId = $id = $node->id; |
|
| 56 | - } |
|
| 55 | + $parentId = $id = $node->id; |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | - return $id; |
|
| 59 | - } |
|
| 58 | + return $id; |
|
| 59 | + } |
|
| 60 | 60 | |
| 61 | - public static function setValue($path, $value, $overwrite = true, $readonly = false) |
|
| 62 | - { |
|
| 63 | - if (! $id = self::getId($path)) { |
|
| 64 | - if (! $id = self::newId($path, $readonly)) return false; |
|
| 65 | - } else { |
|
| 66 | - if (! $overwrite) return false; |
|
| 67 | - } |
|
| 61 | + public static function setValue($path, $value, $overwrite = true, $readonly = false) |
|
| 62 | + { |
|
| 63 | + if (! $id = self::getId($path)) { |
|
| 64 | + if (! $id = self::newId($path, $readonly)) return false; |
|
| 65 | + } else { |
|
| 66 | + if (! $overwrite) return false; |
|
| 67 | + } |
|
| 68 | 68 | |
| 69 | - self::find($id)->update(compact('value', 'readonly')); |
|
| 69 | + self::find($id)->update(compact('value', 'readonly')); |
|
| 70 | 70 | |
| 71 | - return true; |
|
| 72 | - } |
|
| 71 | + return true; |
|
| 72 | + } |
|
| 73 | 73 | |
| 74 | - public static function getValue($path, $translate = false) |
|
| 75 | - { |
|
| 76 | - static $cache; |
|
| 74 | + public static function getValue($path, $translate = false) |
|
| 75 | + { |
|
| 76 | + static $cache; |
|
| 77 | 77 | |
| 78 | - $key = md5(serialize([$path, $translate])); |
|
| 78 | + $key = md5(serialize([$path, $translate])); |
|
| 79 | 79 | |
| 80 | - if (! isset($cache[$key])) { |
|
| 81 | - if(! $id = self::getId($path)) return false; |
|
| 80 | + if (! isset($cache[$key])) { |
|
| 81 | + if(! $id = self::getId($path)) return false; |
|
| 82 | 82 | |
| 83 | - $ret = self::find($id)->value; |
|
| 83 | + $ret = self::find($id)->value; |
|
| 84 | 84 | |
| 85 | - $cache[$key] = $translate? __($ret): $ret; |
|
| 86 | - } |
|
| 85 | + $cache[$key] = $translate? __($ret): $ret; |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - return $cache[$key]; |
|
| 89 | - } |
|
| 88 | + return $cache[$key]; |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | 91 | |
| 92 | - /** |
|
| 93 | - * Creates new array for common use. |
|
| 94 | - * |
|
| 95 | - * @param $path string |
|
| 96 | - * @param $array array initialization value |
|
| 97 | - * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended |
|
| 98 | - * @param $readonly bool do not allow user to change this array from GUI |
|
| 99 | - */ |
|
| 100 | - public static function newArray($path, $array, $overwrite = false, $readonly = false) |
|
| 101 | - { |
|
| 102 | - self::validateArrayKeys($array); |
|
| 92 | + /** |
|
| 93 | + * Creates new array for common use. |
|
| 94 | + * |
|
| 95 | + * @param $path string |
|
| 96 | + * @param $array array initialization value |
|
| 97 | + * @param $overwrite bool whether method should overwrite if array already exists, otherwise the data will be appended |
|
| 98 | + * @param $readonly bool do not allow user to change this array from GUI |
|
| 99 | + */ |
|
| 100 | + public static function newArray($path, $array, $overwrite = false, $readonly = false) |
|
| 101 | + { |
|
| 102 | + self::validateArrayKeys($array); |
|
| 103 | 103 | |
| 104 | - $path = trim($path, '/'); |
|
| 104 | + $path = trim($path, '/'); |
|
| 105 | 105 | |
| 106 | 106 | if ($id = self::getId($path)) { |
| 107 | - if (! $overwrite) { |
|
| 108 | - self::extendArray($path, $array); |
|
| 109 | - return true; |
|
| 110 | - } |
|
| 107 | + if (! $overwrite) { |
|
| 108 | + self::extendArray($path, $array); |
|
| 109 | + return true; |
|
| 110 | + } |
|
| 111 | 111 | |
| 112 | - self::find($id)->delete(); |
|
| 113 | - } |
|
| 112 | + self::find($id)->delete(); |
|
| 113 | + } |
|
| 114 | 114 | |
| 115 | - if(! $id = self::newId($path, $readonly)) return false; |
|
| 115 | + if(! $id = self::newId($path, $readonly)) return false; |
|
| 116 | 116 | |
| 117 | - if ($overwrite) { |
|
| 118 | - self::find($id)->update(compact('readonly')); |
|
| 119 | - } |
|
| 117 | + if ($overwrite) { |
|
| 118 | + self::find($id)->update(compact('readonly')); |
|
| 119 | + } |
|
| 120 | 120 | |
| 121 | - foreach ($array as $key => $value) { |
|
| 122 | - self::setValue($path . '/' . $key, $value, true, $readonly); |
|
| 123 | - } |
|
| 121 | + foreach ($array as $key => $value) { |
|
| 122 | + self::setValue($path . '/' . $key, $value, true, $readonly); |
|
| 123 | + } |
|
| 124 | 124 | |
| 125 | - return true; |
|
| 126 | - } |
|
| 125 | + return true; |
|
| 126 | + } |
|
| 127 | 127 | |
| 128 | - /** |
|
| 129 | - * Extends common data array. |
|
| 130 | - * |
|
| 131 | - * @param $path string |
|
| 132 | - * @param $array array values to insert |
|
| 133 | - * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved |
|
| 134 | - */ |
|
| 135 | - public static function extendArray($path, $array, $overwrite=false, $readonly=false) |
|
| 136 | - { |
|
| 137 | - self::validateArrayKeys($array); |
|
| 128 | + /** |
|
| 129 | + * Extends common data array. |
|
| 130 | + * |
|
| 131 | + * @param $path string |
|
| 132 | + * @param $array array values to insert |
|
| 133 | + * @param $overwrite bool whether method should overwrite data if array key already exists, otherwise the data will be preserved |
|
| 134 | + */ |
|
| 135 | + public static function extendArray($path, $array, $overwrite=false, $readonly=false) |
|
| 136 | + { |
|
| 137 | + self::validateArrayKeys($array); |
|
| 138 | 138 | |
| 139 | - $path = trim($path, '/'); |
|
| 139 | + $path = trim($path, '/'); |
|
| 140 | 140 | |
| 141 | - if (! self::getId($path)){ |
|
| 142 | - return self::newArray($path, $array, $overwrite, $readonly); |
|
| 143 | - } |
|
| 141 | + if (! self::getId($path)){ |
|
| 142 | + return self::newArray($path, $array, $overwrite, $readonly); |
|
| 143 | + } |
|
| 144 | 144 | |
| 145 | - foreach ($array as $key => $value) { |
|
| 146 | - self::setValue($path . '/' . $key, $value, $overwrite, $readonly); |
|
| 147 | - } |
|
| 148 | - } |
|
| 145 | + foreach ($array as $key => $value) { |
|
| 146 | + self::setValue($path . '/' . $key, $value, $overwrite, $readonly); |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | 149 | |
| 150 | - /** |
|
| 151 | - * Returns common data array. |
|
| 152 | - * |
|
| 153 | - * @param string array name |
|
| 154 | - * @return mixed returns an array if such array exists, false otherwise |
|
| 155 | - */ |
|
| 156 | - public static function getArray($path, $sortColumn = 'position', $silent = false) |
|
| 157 | - { |
|
| 158 | - return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all(); |
|
| 159 | - } |
|
| 150 | + /** |
|
| 151 | + * Returns common data array. |
|
| 152 | + * |
|
| 153 | + * @param string array name |
|
| 154 | + * @return mixed returns an array if such array exists, false otherwise |
|
| 155 | + */ |
|
| 156 | + public static function getArray($path, $sortColumn = 'position', $silent = false) |
|
| 157 | + { |
|
| 158 | + return self::getCollection($path, $silent)->sortBy($sortColumn)->pluck('value', 'key')->all(); |
|
| 159 | + } |
|
| 160 | 160 | |
| 161 | - /** |
|
| 162 | - * Removes common data array or entry. |
|
| 163 | - * |
|
| 164 | - * @param $path string |
|
| 165 | - * @return true on success, false otherwise |
|
| 166 | - */ |
|
| 167 | - public static function deleteArray($path){ |
|
| 168 | - if (! $id = self::getId($path, true)) return false; |
|
| 161 | + /** |
|
| 162 | + * Removes common data array or entry. |
|
| 163 | + * |
|
| 164 | + * @param $path string |
|
| 165 | + * @return true on success, false otherwise |
|
| 166 | + */ |
|
| 167 | + public static function deleteArray($path){ |
|
| 168 | + if (! $id = self::getId($path, true)) return false; |
|
| 169 | 169 | |
| 170 | - self::find($id)->delete(); |
|
| 171 | - } |
|
| 170 | + self::find($id)->delete(); |
|
| 171 | + } |
|
| 172 | 172 | |
| 173 | - /** |
|
| 174 | - * Returns common data collection. |
|
| 175 | - * |
|
| 176 | - * @param $path string |
|
| 177 | - * @return Collection |
|
| 178 | - */ |
|
| 179 | - public static function getCollection($path, $silent = false) |
|
| 180 | - { |
|
| 181 | - static $cache; |
|
| 173 | + /** |
|
| 174 | + * Returns common data collection. |
|
| 175 | + * |
|
| 176 | + * @param $path string |
|
| 177 | + * @return Collection |
|
| 178 | + */ |
|
| 179 | + public static function getCollection($path, $silent = false) |
|
| 180 | + { |
|
| 181 | + static $cache; |
|
| 182 | 182 | |
| 183 | - if(isset($cache[$path])) { |
|
| 184 | - return $cache[$path]; |
|
| 185 | - } |
|
| 183 | + if(isset($cache[$path])) { |
|
| 184 | + return $cache[$path]; |
|
| 185 | + } |
|
| 186 | 186 | |
| 187 | - if (! $id = self::getId($path)) { |
|
| 188 | - if ($silent) return collection(); |
|
| 187 | + if (! $id = self::getId($path)) { |
|
| 188 | + if ($silent) return collection(); |
|
| 189 | 189 | |
| 190 | - new \Exception('Invalid CommonData::getArray() request: ' . $path); |
|
| 191 | - } |
|
| 190 | + new \Exception('Invalid CommonData::getArray() request: ' . $path); |
|
| 191 | + } |
|
| 192 | 192 | |
| 193 | - return $cache[$path] = self::where('parent_id', $id)->get(); |
|
| 194 | - } |
|
| 193 | + return $cache[$path] = self::where('parent_id', $id)->get(); |
|
| 194 | + } |
|
| 195 | 195 | |
| 196 | - protected static function validateArrayKeys($array) |
|
| 197 | - { |
|
| 198 | - foreach($array as $key => $value) { |
|
| 199 | - if (strpos($key, '/') === false) continue; |
|
| 196 | + protected static function validateArrayKeys($array) |
|
| 197 | + { |
|
| 198 | + foreach($array as $key => $value) { |
|
| 199 | + if (strpos($key, '/') === false) continue; |
|
| 200 | 200 | |
| 201 | - \Exception('Invalid common data key: '. $key); |
|
| 202 | - } |
|
| 203 | - } |
|
| 201 | + \Exception('Invalid common data key: '. $key); |
|
| 202 | + } |
|
| 203 | + } |
|
| 204 | 204 | } |
| 205 | 205 | \ No newline at end of file |