From f9959e06962f9381b734428e292b1391af68b011 Mon Sep 17 00:00:00 2001 From: aB0t Date: Sun, 4 Jun 2023 20:30:49 +0200 Subject: [PATCH] update 2023-06-04 20:30:49 --- .../settings.json | 4 +- .../README.md | 2 +- .../code.php | 4 +- .../code.power | 4 +- .../settings.json | 12 +- .../settings.json | 4 +- .../settings.json | 10 +- .../README.md | 12 +- .../code.php | 18 +- .../code.power | 18 +- .../README.md | 6 +- .../code.php | 6 +- .../code.power | 6 +- .../settings.json | 10 +- .../README.md | 38 +- .../code.php | 54 ++- .../code.power | 54 ++- .../code.php | 421 +++++++----------- 18 files changed, 341 insertions(+), 342 deletions(-) diff --git a/src/11892cfa-374e-4e3f-b0bc-531871c822d9/settings.json b/src/11892cfa-374e-4e3f-b0bc-531871c822d9/settings.json index 4568bc5..07cc075 100644 --- a/src/11892cfa-374e-4e3f-b0bc-531871c822d9/settings.json +++ b/src/11892cfa-374e-4e3f-b0bc-531871c822d9/settings.json @@ -24,11 +24,11 @@ "use": "56465044-94ed-4e00-b6db-160c67163df8", "as": "default" }, - "use_selection4": { + "use_selection3": { "use": "116eb429-bc51-4d14-b9aa-7145c86a29d1", "as": "default" }, - "use_selection3": { + "use_selection4": { "use": "51bb0397-fa7c-4f7a-a4c5-1f95fdacad38", "as": "default" } diff --git a/src/491c91ce-6355-40d3-bbbd-622473c6c026/README.md b/src/491c91ce-6355-40d3-bbbd-622473c6c026/README.md index 5e0f6e9..973f6ca 100644 --- a/src/491c91ce-6355-40d3-bbbd-622473c6c026/README.md +++ b/src/491c91ce-6355-40d3-bbbd-622473c6c026/README.md @@ -14,7 +14,7 @@ class Books << (F,LightGreen) >> #Green { + get(string $translation = 'kjv') : ?object + list(string $translation = 'kjv') : ?object + checksum(string $translation = 'kjv') : ?object - + sha(int $book, string $translation = 'kjv') : ?string + + sha(string $translation, int $book) : ?string } note right of Books::get diff --git a/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.php b/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.php index ec71da8..12a36ca 100644 --- a/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.php +++ b/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.php @@ -76,13 +76,13 @@ final class Books extends Api /** * Get the book's checksums in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return string|null The response checksums or null if an error occurs. * @since 2.0.1 */ - public function sha(int $book, string $translation = 'kjv'): ?string + public function sha(string $translation, int $book): ?string { return trim( $this->response->get( diff --git a/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.power b/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.power index 41730ad..f8be15e 100644 --- a/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.power +++ b/src/491c91ce-6355-40d3-bbbd-622473c6c026/code.power @@ -52,13 +52,13 @@ /** * Get the book's checksums in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return string|null The response checksums or null if an error occurs. * @since 2.0.1 */ - public function sha(int $book, string $translation = 'kjv'): ?string + public function sha(string $translation, int $book): ?string { return trim( $this->response->get( diff --git a/src/51bb0397-fa7c-4f7a-a4c5-1f95fdacad38/settings.json b/src/51bb0397-fa7c-4f7a-a4c5-1f95fdacad38/settings.json index 84e316e..ed9dfb8 100644 --- a/src/51bb0397-fa7c-4f7a-a4c5-1f95fdacad38/settings.json +++ b/src/51bb0397-fa7c-4f7a-a4c5-1f95fdacad38/settings.json @@ -12,27 +12,27 @@ "system_name": "Joomla.GetBible.Service.Database", "type": "class", "use_selection": { - "use_selection4": { + "use_selection0": { "use": "524eb8f6-38d4-47dc-92ad-98b94e099ac0", "as": "BaseInsert" }, - "use_selection5": { + "use_selection1": { "use": "cce56585-58b0-4f72-a92c-e2635ea52d83", "as": "BaseUpdate" }, - "use_selection6": { + "use_selection2": { "use": "06f8eada-d59b-441c-b287-0aea1793da5a", "as": "BaseLoad" }, - "use_selection0": { + "use_selection3": { "use": "a07d90f6-6ff2-40a1-99c1-0f2cf33c9adf", "as": "default" }, - "use_selection1": { + "use_selection4": { "use": "c03b9c61-17d3-4774-a335-783903719f83", "as": "default" }, - "use_selection2": { + "use_selection5": { "use": "d7a5f0c6-de60-4d31-b3e4-5d668a8f7d2e", "as": "default" } diff --git a/src/56465044-94ed-4e00-b6db-160c67163df8/settings.json b/src/56465044-94ed-4e00-b6db-160c67163df8/settings.json index eeaf8ca..e124f5f 100644 --- a/src/56465044-94ed-4e00-b6db-160c67163df8/settings.json +++ b/src/56465044-94ed-4e00-b6db-160c67163df8/settings.json @@ -20,11 +20,11 @@ "use": "ff8d5fdb-2d1f-4178-bd18-a43b8efd1068", "as": "default" }, - "use_selection3": { + "use_selection2": { "use": "8336e3c4-f11b-41bc-a2b1-976f99442a84", "as": "default" }, - "use_selection2": { + "use_selection3": { "use": "f815fb33-f721-48a5-a84e-53f1986e8881", "as": "default" } diff --git a/src/91b37bd7-b314-48be-91cf-434ec823bd80/settings.json b/src/91b37bd7-b314-48be-91cf-434ec823bd80/settings.json index 4732fbc..e85fe35 100644 --- a/src/91b37bd7-b314-48be-91cf-434ec823bd80/settings.json +++ b/src/91b37bd7-b314-48be-91cf-434ec823bd80/settings.json @@ -12,23 +12,23 @@ "system_name": "Joomla.GetBible.Model.Upsert", "type": "final class", "use_selection": { - "use_selection3": { + "use_selection0": { "use": "71075f03-4e77-4fc0-840a-ef55fd9260b2", "as": "default" }, - "use_selection4": { + "use_selection1": { "use": "ff8d5fdb-2d1f-4178-bd18-a43b8efd1068", "as": "default" }, - "use_selection0": { + "use_selection2": { "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef", "as": "default" }, - "use_selection1": { + "use_selection3": { "use": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a", "as": "default" }, - "use_selection2": { + "use_selection4": { "use": "91004529-94a9-4590-b842-e7c6b624ecf5", "as": "default" } diff --git a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/README.md b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/README.md index 0dd76d2..3d55625 100644 --- a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/README.md +++ b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/README.md @@ -11,10 +11,10 @@ ```uml @startuml class Chapters << (F,LightGreen) >> #Green { - + get(int $book, string $translation = 'kjv') : ?object - + list(int $book, string $translation = 'kjv') : ?object - + checksum(int $book, string $translation = 'kjv') : ?object - + sha(int $chapter, int $book, ...) : ?string + + get(string $translation, int $book) : ?object + + list(string $translation, int $book) : ?object + + checksum(string $translation, int $book) : ?object + + sha(string $translation, int $book, ...) : ?string } note right of Chapters::get @@ -45,9 +45,9 @@ note right of Chapters::sha return: ?string arguments: - int $chapter + string $translation int $book - string $translation = 'kjv' + int $chapter end note @enduml diff --git a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.php b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.php index 26d0dd2..0e9d06e 100644 --- a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.php +++ b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.php @@ -25,13 +25,13 @@ final class Chapters extends Api /** * Get the chapters in a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function get(int $book, string $translation = 'kjv'): ?object + public function get(string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -43,13 +43,13 @@ final class Chapters extends Api /** * List the chapters of a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function list(int $book, string $translation = 'kjv'): ?object + public function list( string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -61,13 +61,13 @@ final class Chapters extends Api /** * List the chapters checksums of a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function checksum(int $book, string $translation = 'kjv'): ?object + public function checksum(string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -79,14 +79,14 @@ final class Chapters extends Api /** * Get the chapter's checksums of a book in a translation * - * @param int $chapter The chapter number. - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. + * @param int $chapter The chapter number. * * @return string|null The response checksum or null if an error occurs. * @since 2.0.1 */ - public function sha(int $chapter, int $book, string $translation = 'kjv'): ?string + public function sha(string $translation, int $book, int $chapter): ?string { return trim( $this->response->get( diff --git a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.power b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.power index 981fa46..98d0472 100644 --- a/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.power +++ b/src/a752e4b2-9b5e-4188-8d33-3799c46d5119/code.power @@ -1,13 +1,13 @@ /** * Get the chapters in a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function get(int $book, string $translation = 'kjv'): ?object + public function get(string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -19,13 +19,13 @@ /** * List the chapters of a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function list(int $book, string $translation = 'kjv'): ?object + public function list( string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -37,13 +37,13 @@ /** * List the chapters checksums of a book in a translation * - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function checksum(int $book, string $translation = 'kjv'): ?object + public function checksum(string $translation, int $book): ?object { return $this->response->get( $this->http->get( @@ -55,14 +55,14 @@ /** * Get the chapter's checksums of a book in a translation * - * @param int $chapter The chapter number. - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. + * @param int $chapter The chapter number. * * @return string|null The response checksum or null if an error occurs. * @since 2.0.1 */ - public function sha(int $chapter, int $book, string $translation = 'kjv'): ?string + public function sha(string $translation, int $book, int $chapter): ?string { return trim( $this->response->get( diff --git a/src/afa508bf-78f8-4616-97cc-f2809584c086/README.md b/src/afa508bf-78f8-4616-97cc-f2809584c086/README.md index 4b0182c..3216e12 100644 --- a/src/afa508bf-78f8-4616-97cc-f2809584c086/README.md +++ b/src/afa508bf-78f8-4616-97cc-f2809584c086/README.md @@ -11,7 +11,7 @@ ```uml @startuml class Verses << (F,LightGreen) >> #Green { - + get(int $chapter, int $book, ...) : ?object + + get(string $translation, int $book, ...) : ?object } note right of Verses::get @@ -21,9 +21,9 @@ note right of Verses::get return: ?object arguments: - int $chapter + string $translation int $book - string $translation = 'kjv' + int $chapter end note @enduml diff --git a/src/afa508bf-78f8-4616-97cc-f2809584c086/code.php b/src/afa508bf-78f8-4616-97cc-f2809584c086/code.php index d64835c..8110f72 100644 --- a/src/afa508bf-78f8-4616-97cc-f2809584c086/code.php +++ b/src/afa508bf-78f8-4616-97cc-f2809584c086/code.php @@ -25,14 +25,14 @@ final class Verses extends Api /** * Get the verses of chapter in a book in a translation * - * @param int $chapter The chapter number. - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. + * @param int $chapter The chapter number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function get(int $chapter, int $book, string $translation = 'kjv'): ?object + public function get(string $translation, int $book, int $chapter): ?object { return $this->response->get( $this->http->get( diff --git a/src/afa508bf-78f8-4616-97cc-f2809584c086/code.power b/src/afa508bf-78f8-4616-97cc-f2809584c086/code.power index d98f6ea..b1436ce 100644 --- a/src/afa508bf-78f8-4616-97cc-f2809584c086/code.power +++ b/src/afa508bf-78f8-4616-97cc-f2809584c086/code.power @@ -1,14 +1,14 @@ /** * Get the verses of chapter in a book in a translation * - * @param int $chapter The chapter number. - * @param int $book The book number. * @param string $translation The translation. + * @param int $book The book number. + * @param int $chapter The chapter number. * * @return object|null The response object or null if an error occurs. * @since 2.0.1 */ - public function get(int $chapter, int $book, string $translation = 'kjv'): ?object + public function get(string $translation, int $book, int $chapter): ?object { return $this->response->get( $this->http->get( diff --git a/src/b1bd2b4f-dede-44ad-86e9-2a595a0a9ca0/settings.json b/src/b1bd2b4f-dede-44ad-86e9-2a595a0a9ca0/settings.json index 826c707..1956250 100644 --- a/src/b1bd2b4f-dede-44ad-86e9-2a595a0a9ca0/settings.json +++ b/src/b1bd2b4f-dede-44ad-86e9-2a595a0a9ca0/settings.json @@ -12,23 +12,23 @@ "system_name": "Joomla.GetBible.Model.Load", "type": "final class", "use_selection": { - "use_selection3": { + "use_selection0": { "use": "71075f03-4e77-4fc0-840a-ef55fd9260b2", "as": "default" }, - "use_selection4": { + "use_selection1": { "use": "ff8d5fdb-2d1f-4178-bd18-a43b8efd1068", "as": "default" }, - "use_selection0": { + "use_selection2": { "use": "1f28cb53-60d9-4db1-b517-3c7dc6b429ef", "as": "default" }, - "use_selection1": { + "use_selection3": { "use": "0a59c65c-9daf-4bc9-baf4-e063ff9e6a8a", "as": "default" }, - "use_selection2": { + "use_selection4": { "use": "91004529-94a9-4590-b842-e7c6b624ecf5", "as": "default" } diff --git a/src/c03b9c61-17d3-4774-a335-783903719f83/README.md b/src/c03b9c61-17d3-4774-a335-783903719f83/README.md index e5fe068..289cd25 100644 --- a/src/c03b9c61-17d3-4774-a335-783903719f83/README.md +++ b/src/c03b9c61-17d3-4774-a335-783903719f83/README.md @@ -15,8 +15,8 @@ class Load << (F,LightGreen) >> #Green { # Model $model # Database $load + __construct(Table $table, Model $model, ...) - + value(int $id, string $field, ...) : mixed - + item(int $id, ?string $table) : ?object + + value(array $keys, string $field, ...) : mixed + + item(array $keys, ?string $table) : ?object + items(array $ids, string $table) : ?array } @@ -33,20 +33,34 @@ end note note right of Load::value Get a value from a given table -Example: $this->value(23, 'value_key', 'table_name'); +Example: $this->value( +[ +'abbreviation' => 'kjv', +'book_nr' => 62, +'chapter' => 3, +'verse' => 16 +], 'value_key', 'table_name' +); since: 2.0.1 return: mixed arguments: - int $id + array $keys string $field string $table end note note right of Load::item Get values from a given table -Example: $this->item(23, 'table_name'); +Example: $this->item( +[ +'abbriviation' => 'kjv', +'book_nr' => 62, +'chapter' => 3, +'verse' => 16 +], 'table_name' +); since: 2.0.1 return: ?object @@ -54,6 +68,20 @@ end note note right of Load::items Get values from a given table +Example: $this->items( +[ +'abbriviation' => [ +'operator' => 'IN', +'value' => ['kjv', 'aov'] +], +'book_nr' => 62, +'chapter' => 3, +'verse' => [ +'operator' => 'IN', +'value' => [16, 17, 18] +] +], 'table_name' +); Example: $this->items($ids, 'table_name'); since: 2.0.1 diff --git a/src/c03b9c61-17d3-4774-a335-783903719f83/code.php b/src/c03b9c61-17d3-4774-a335-783903719f83/code.php index 6edefb0..ea97a0e 100644 --- a/src/c03b9c61-17d3-4774-a335-783903719f83/code.php +++ b/src/c03b9c61-17d3-4774-a335-783903719f83/code.php @@ -66,23 +66,32 @@ final class Load /** * Get a value from a given table - * Example: $this->value(23, 'value_key', 'table_name'); + * Example: $this->value( + * [ + * 'abbreviation' => 'kjv', + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => 16 + * ], 'value_key', 'table_name' + * ); * - * @param int $id The item ID + * @param array $keys The item keys * @param string $field The field key * @param string $table The table * * @return mixed * @since 2.0.1 */ - public function value(int $id, string $field, string $table) + public function value(array $keys, string $field, string $table) { // check if this is a valid table - if ($id > 0 && $this->table->exist($table, $field)) + if ($this->prefix($keys) && $this->table->exist($table, $field)) { return $this->model->value( $this->load->value( - ["a.${field}" => $field], ['a' => $table], ['a.id' => $id] + ["a.${field}" => $field], + ['a' => $table], + $keys ), $field, $table @@ -94,22 +103,31 @@ final class Load /** * Get values from a given table - * Example: $this->item(23, 'table_name'); + * Example: $this->item( + * [ + * 'abbriviation' => 'kjv', + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => 16 + * ], 'table_name' + * ); * - * @param int $id The item ID + * @param array $keys The item keys * @param string $table The table * * @return object|null * @since 2.0.1 */ - public function item(int $id, ?string $table): ?object + public function item(array $keys, ?string $table): ?object { // check if this is a valid table - if ($id > 0 && $this->table->exist($table)) + if ($this->prefix($keys) && $this->table->exist($table)) { return $this->model->item( $this->load->item( - ['all' => 'a.*'], ['a' => $table], ['a.id' => $id] + ['all' => 'a.*'], + ['a' => $table], + $keys ), $table ); @@ -120,6 +138,20 @@ final class Load /** * Get values from a given table + * Example: $this->items( + * [ + * 'abbriviation' => [ + * 'operator' => 'IN', + * 'value' => ['kjv', 'aov'] + * ], + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => [ + * 'operator' => 'IN', + * 'value' => [16, 17, 18] + * ] + * ], 'table_name' + * ); * Example: $this->items($ids, 'table_name'); * * @param array $ids The item ids @@ -131,7 +163,7 @@ final class Load public function items(array $ids, string $table): ?array { // check if this is a valid table - if ($this->table->exist($table)) + if ($this->prefix($keys) && $this->table->exist($table)) { return $this->model->items( $this->load->items( diff --git a/src/c03b9c61-17d3-4774-a335-783903719f83/code.power b/src/c03b9c61-17d3-4774-a335-783903719f83/code.power index 1622ead..3c8363d 100644 --- a/src/c03b9c61-17d3-4774-a335-783903719f83/code.power +++ b/src/c03b9c61-17d3-4774-a335-783903719f83/code.power @@ -40,23 +40,32 @@ /** * Get a value from a given table - * Example: $this->value(23, 'value_key', 'table_name'); + * Example: $this->value( + * [ + * 'abbreviation' => 'kjv', + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => 16 + * ], 'value_key', 'table_name' + * ); * - * @param int $id The item ID + * @param array $keys The item keys * @param string $field The field key * @param string $table The table * * @return mixed * @since 2.0.1 */ - public function value(int $id, string $field, string $table) + public function value(array $keys, string $field, string $table) { // check if this is a valid table - if ($id > 0 && $this->table->exist($table, $field)) + if ($this->prefix($keys) && $this->table->exist($table, $field)) { return $this->model->value( $this->load->value( - ["a.${field}" => $field], ['a' => $table], ['a.id' => $id] + ["a.${field}" => $field], + ['a' => $table], + $keys ), $field, $table @@ -68,22 +77,31 @@ /** * Get values from a given table - * Example: $this->item(23, 'table_name'); + * Example: $this->item( + * [ + * 'abbriviation' => 'kjv', + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => 16 + * ], 'table_name' + * ); * - * @param int $id The item ID + * @param array $keys The item keys * @param string $table The table * * @return object|null * @since 2.0.1 */ - public function item(int $id, ?string $table): ?object + public function item(array $keys, ?string $table): ?object { // check if this is a valid table - if ($id > 0 && $this->table->exist($table)) + if ($this->prefix($keys) && $this->table->exist($table)) { return $this->model->item( $this->load->item( - ['all' => 'a.*'], ['a' => $table], ['a.id' => $id] + ['all' => 'a.*'], + ['a' => $table], + $keys ), $table ); @@ -94,6 +112,20 @@ /** * Get values from a given table + * Example: $this->items( + * [ + * 'abbriviation' => [ + * 'operator' => 'IN', + * 'value' => ['kjv', 'aov'] + * ], + * 'book_nr' => 62, + * 'chapter' => 3, + * 'verse' => [ + * 'operator' => 'IN', + * 'value' => [16, 17, 18] + * ] + * ], 'table_name' + * ); * Example: $this->items($ids, 'table_name'); * * @param array $ids The item ids @@ -105,7 +137,7 @@ public function items(array $ids, string $table): ?array { // check if this is a valid table - if ($this->table->exist($table)) + if ($this->prefix($keys) && $this->table->exist($table)) { return $this->model->items( $this->load->items( diff --git a/src/ff8d5fdb-2d1f-4178-bd18-a43b8efd1068/code.php b/src/ff8d5fdb-2d1f-4178-bd18-a43b8efd1068/code.php index 0400585..d775c88 100644 --- a/src/ff8d5fdb-2d1f-4178-bd18-a43b8efd1068/code.php +++ b/src/ff8d5fdb-2d1f-4178-bd18-a43b8efd1068/code.php @@ -31,18 +31,18 @@ class Table extends BaseTable implements Tableinterface **/ protected array $tables = [ 'translation' => [ - 'name' => [ - 'name' => 'name', - 'label' => 'COM_GETBIBLE_TRANSLATION_NAME_LABEL', + 'translation' => [ + 'name' => 'translation', + 'label' => 'COM_GETBIBLE_TRANSLATION_TRANSLATION_LABEL', 'type' => 'text', 'title' => true, 'list' => 'translations', 'store' => NULL, 'tab_name' => 'Details', ], - 'abbr' => [ - 'name' => 'abbr', - 'label' => 'COM_GETBIBLE_TRANSLATION_ABBR_LABEL', + 'abbreviation' => [ + 'name' => 'abbreviation', + 'label' => 'COM_GETBIBLE_TRANSLATION_ABBREVIATION_LABEL', 'type' => 'text', 'title' => false, 'list' => 'translations', @@ -58,68 +58,176 @@ class Table extends BaseTable implements Tableinterface 'store' => NULL, 'tab_name' => 'Details', ], - 'bidi' => [ - 'name' => 'bidi', - 'label' => 'COM_GETBIBLE_TRANSLATION_BIDI_LABEL', + 'direction' => [ + 'name' => 'direction', + 'label' => 'COM_GETBIBLE_TRANSLATION_DIRECTION_LABEL', 'type' => 'radio', 'title' => false, 'list' => 'translations', 'store' => NULL, 'tab_name' => 'Details', ], - 'testament' => [ - 'name' => 'testament', - 'label' => 'COM_GETBIBLE_TRANSLATION_TESTAMENT_LABEL', - 'type' => 'list', + 'distribution_history' => [ + 'name' => 'distribution_history', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_HISTORY_LABEL', + 'type' => 'subform', + 'title' => false, + 'list' => 'translations', + 'store' => 'json', + 'tab_name' => 'Details', + ], + 'distribution_about' => [ + 'name' => 'distribution_about', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_ABOUT_LABEL', + 'type' => 'textarea', 'title' => false, 'list' => 'translations', 'store' => NULL, 'tab_name' => 'Details', ], - 'copyright' => [ - 'name' => 'copyright', - 'label' => 'COM_GETBIBLE_TRANSLATION_COPYRIGHT_LABEL', + 'distribution_license' => [ + 'name' => 'distribution_license', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_LICENSE_LABEL', 'type' => 'textarea', 'title' => false, 'list' => 'translations', 'store' => NULL, 'tab_name' => 'Details', ], + 'distribution_source' => [ + 'name' => 'distribution_source', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_SOURCE_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_sourcetype' => [ + 'name' => 'distribution_sourcetype', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_SOURCETYPE_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_versification' => [ + 'name' => 'distribution_versification', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_VERSIFICATION_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'sha' => [ + 'name' => 'sha', + 'label' => 'COM_GETBIBLE_TRANSLATION_SHA_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'encoding' => [ + 'name' => 'encoding', + 'label' => 'COM_GETBIBLE_TRANSLATION_ENCODING_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_lcsh' => [ + 'name' => 'distribution_lcsh', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_LCSH_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_version_date' => [ + 'name' => 'distribution_version_date', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_VERSION_DATE_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_version' => [ + 'name' => 'distribution_version', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_VERSION_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'lang' => [ + 'name' => 'lang', + 'label' => 'COM_GETBIBLE_TRANSLATION_LANG_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'distribution_abbreviation' => [ + 'name' => 'distribution_abbreviation', + 'label' => 'COM_GETBIBLE_TRANSLATION_DISTRIBUTION_ABBREVIATION_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'translations', + 'store' => NULL, + 'tab_name' => 'Details', + ], ], 'book' => [ - 'book' => [ - 'name' => 'book', - 'label' => 'COM_GETBIBLE_BOOK_BOOK_LABEL', - 'type' => 'booknames', + 'name' => [ + 'name' => 'name', + 'label' => 'COM_GETBIBLE_BOOK_NAME_LABEL', + 'type' => 'text', 'title' => true, 'list' => 'books', 'store' => NULL, 'tab_name' => 'Details', ], - 'translation' => [ - 'name' => 'translation', - 'label' => 'COM_GETBIBLE_BOOK_TRANSLATION_LABEL', + 'abbreviation' => [ + 'name' => 'abbreviation', + 'label' => 'COM_GETBIBLE_BOOK_ABBREVIATION_LABEL', 'type' => 'translations', 'title' => false, 'list' => 'books', 'store' => NULL, 'tab_name' => 'Details', ], - 'scripture' => [ - 'name' => 'scripture', - 'label' => 'COM_GETBIBLE_BOOK_SCRIPTURE_LABEL', - 'type' => 'subform', + 'nr' => [ + 'name' => 'nr', + 'label' => 'COM_GETBIBLE_BOOK_NR_LABEL', + 'type' => 'number', 'title' => false, 'list' => 'books', - 'store' => 'json', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'sha' => [ + 'name' => 'sha', + 'label' => 'COM_GETBIBLE_BOOK_SHA_LABEL', + 'type' => 'text', + 'title' => false, + 'list' => 'books', + 'store' => NULL, 'tab_name' => 'Details', ], ], 'chapter' => [ - 'book' => [ - 'name' => 'book', - 'label' => 'COM_GETBIBLE_CHAPTER_BOOK_LABEL', - 'type' => 'booknames', + 'name' => [ + 'name' => 'name', + 'label' => 'COM_GETBIBLE_CHAPTER_NAME_LABEL', + 'type' => 'text', 'title' => true, 'list' => 'chapters', 'store' => NULL, @@ -134,30 +242,39 @@ class Table extends BaseTable implements Tableinterface 'store' => NULL, 'tab_name' => 'Details', ], - 'translation' => [ - 'name' => 'translation', - 'label' => 'COM_GETBIBLE_CHAPTER_TRANSLATION_LABEL', + 'book_nr' => [ + 'name' => 'book_nr', + 'label' => 'COM_GETBIBLE_CHAPTER_BOOK_NR_LABEL', + 'type' => 'number', + 'title' => false, + 'list' => 'chapters', + 'store' => NULL, + 'tab_name' => 'Details', + ], + 'abbreviation' => [ + 'name' => 'abbreviation', + 'label' => 'COM_GETBIBLE_CHAPTER_ABBREVIATION_LABEL', 'type' => 'translations', 'title' => false, 'list' => 'chapters', 'store' => NULL, 'tab_name' => 'Details', ], - 'scripture' => [ - 'name' => 'scripture', - 'label' => 'COM_GETBIBLE_CHAPTER_SCRIPTURE_LABEL', - 'type' => 'subform', + 'sha' => [ + 'name' => 'sha', + 'label' => 'COM_GETBIBLE_CHAPTER_SHA_LABEL', + 'type' => 'text', 'title' => false, 'list' => 'chapters', - 'store' => 'json', + 'store' => NULL, 'tab_name' => 'Details', ], ], 'verse' => [ - 'book' => [ - 'name' => 'book', - 'label' => 'COM_GETBIBLE_VERSE_BOOK_LABEL', - 'type' => 'booknames', + 'book_nr' => [ + 'name' => 'book_nr', + 'label' => 'COM_GETBIBLE_VERSE_BOOK_NR_LABEL', + 'type' => 'number', 'title' => true, 'list' => 'verses', 'store' => NULL, @@ -181,9 +298,9 @@ class Table extends BaseTable implements Tableinterface 'store' => NULL, 'tab_name' => 'Details', ], - 'translation' => [ - 'name' => 'translation', - 'label' => 'COM_GETBIBLE_VERSE_TRANSLATION_LABEL', + 'abbreviation' => [ + 'name' => 'abbreviation', + 'label' => 'COM_GETBIBLE_VERSE_ABBREVIATION_LABEL', 'type' => 'translations', 'title' => false, 'list' => 'verses', @@ -199,216 +316,6 @@ class Table extends BaseTable implements Tableinterface 'store' => NULL, 'tab_name' => 'Details', ], - 'testament' => [ - 'name' => 'testament', - 'label' => 'COM_GETBIBLE_VERSE_TESTAMENT_LABEL', - 'type' => 'list', - 'title' => false, - 'list' => 'verses', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'book_name' => [ - 'name' => [ - 'name' => 'name', - 'label' => 'COM_GETBIBLE_BOOK_NAME_NAME_LABEL', - 'type' => 'text', - 'title' => true, - 'list' => 'book_names', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'translation' => [ - 'name' => 'translation', - 'label' => 'COM_GETBIBLE_BOOK_NAME_TRANSLATION_LABEL', - 'type' => 'translations', - 'title' => false, - 'list' => 'book_names', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'abbreviations' => [ - 'name' => 'abbreviations', - 'label' => 'COM_GETBIBLE_BOOK_NAME_ABBREVIATIONS_LABEL', - 'type' => 'subform', - 'title' => false, - 'list' => 'book_names', - 'store' => 'json', - 'tab_name' => 'Details', - ], - 'chapter' => [ - 'name' => 'chapter', - 'label' => 'COM_GETBIBLE_BOOK_NAME_CHAPTER_LABEL', - 'type' => 'number', - 'title' => false, - 'list' => 'book_names', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'number' => [ - 'name' => 'number', - 'label' => 'COM_GETBIBLE_BOOK_NAME_NUMBER_LABEL', - 'type' => 'text', - 'title' => false, - 'list' => 'book_names', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'highlight' => [ - 'user' => [ - 'name' => 'user', - 'label' => 'COM_GETBIBLE_HIGHLIGHT_USER_LABEL', - 'type' => 'user', - 'title' => true, - 'list' => 'highlights', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'book' => [ - 'name' => 'book', - 'label' => 'COM_GETBIBLE_HIGHLIGHT_BOOK_LABEL', - 'type' => 'booknames', - 'title' => false, - 'list' => 'highlights', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'chapter' => [ - 'name' => 'chapter', - 'label' => 'COM_GETBIBLE_HIGHLIGHT_CHAPTER_LABEL', - 'type' => 'number', - 'title' => false, - 'list' => 'highlights', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'verse' => [ - 'name' => 'verse', - 'label' => 'COM_GETBIBLE_HIGHLIGHT_VERSE_LABEL', - 'type' => 'number', - 'title' => false, - 'list' => 'highlights', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'colour' => [ - 'name' => 'colour', - 'label' => 'COM_GETBIBLE_HIGHLIGHT_COLOUR_LABEL', - 'type' => 'color', - 'title' => false, - 'list' => 'highlights', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'note' => [ - 'user' => [ - 'name' => 'user', - 'label' => 'COM_GETBIBLE_NOTE_USER_LABEL', - 'type' => 'user', - 'title' => true, - 'list' => 'notes', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'book' => [ - 'name' => 'book', - 'label' => 'COM_GETBIBLE_NOTE_BOOK_LABEL', - 'type' => 'booknames', - 'title' => false, - 'list' => 'notes', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'chapter' => [ - 'name' => 'chapter', - 'label' => 'COM_GETBIBLE_NOTE_CHAPTER_LABEL', - 'type' => 'number', - 'title' => false, - 'list' => 'notes', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'verse' => [ - 'name' => 'verse', - 'label' => 'COM_GETBIBLE_NOTE_VERSE_LABEL', - 'type' => 'number', - 'title' => false, - 'list' => 'notes', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'note' => [ - 'name' => 'note', - 'label' => 'COM_GETBIBLE_NOTE_NOTE_LABEL', - 'type' => 'textarea', - 'title' => false, - 'list' => 'notes', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'taged_verse' => [ - 'title' => [ - 'name' => 'title', - 'label' => 'COM_GETBIBLE_TAGED_VERSE_TITLE_LABEL', - 'type' => 'text', - 'title' => true, - 'list' => 'taged_verses', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'alias' => [ - 'name' => 'alias', - 'label' => 'COM_GETBIBLE_TAGED_VERSE_ALIAS_LABEL', - 'type' => 'text', - 'title' => false, - 'list' => 'taged_verses', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'tag' => [ - 'title' => [ - 'name' => 'title', - 'label' => 'COM_GETBIBLE_TAG_TITLE_LABEL', - 'type' => 'text', - 'title' => true, - 'list' => 'tags', - 'store' => NULL, - 'tab_name' => 'Details', - ], - 'alias' => [ - 'name' => 'alias', - 'label' => 'COM_GETBIBLE_TAG_ALIAS_LABEL', - 'type' => 'text', - 'title' => false, - 'list' => 'tags', - 'store' => NULL, - 'tab_name' => 'Details', - ], - ], - 'template' => [ - 'name' => [ - 'name' => 'name', - 'label' => 'COM_GETBIBLE_TEMPLATE_NAME_LABEL', - 'type' => 'text', - 'title' => true, - 'list' => 'templates', - 'store' => NULL, - 'tab_name' => 'Verses', - ], - 'alias' => [ - 'name' => 'alias', - 'label' => 'COM_GETBIBLE_TEMPLATE_ALIAS_LABEL', - 'type' => 'text', - 'title' => false, - 'list' => 'templates', - 'store' => NULL, - 'tab_name' => 'Verses', - ], ], ]; }